From a3f4423d37ced7fdba2ba530f033e08656911226 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:10:27 +0100 Subject: [PATCH 01/20] moves exploration areas out of the messy every area ingame file --- code/game/area/Space Station 13 areas.dm | 46 ---------------------- code/game/area/station/exporation.dm | 49 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 code/game/area/station/exporation.dm diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7f14e0dc78de..21acbb9487a8 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -3553,52 +3553,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Telecommunications Power Control" icon_state = "tcomsatwest" - -//Exploration areas -/area/exploration - name = "\improper Exploration Foyer" - icon_state = "purple" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS - -/area/exploration/excursion_dock - name = "\improper Excursion Shuttle Dock" - icon_state = "hangar" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/exploration/courser_dock - name = "\improper Courser Shuttle Dock" - icon_state = "hangar" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/exploration/explorer_prep - name = "\improper Explorer Prep Room" - icon_state = "locker" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/exploration/pilot_prep - name = "\improper Pilot Prep Room" - icon_state = "locker" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/exploration/meeting - name = "\improper Explorer Meeting Room" - icon_state = "northeast" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE - -/area/exploration/showers - name = "\improper Explorer Showers" - icon_state = "restrooms" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE - -/area/exploration/medical - name = "\improper Exploration Med Station" - icon_state = "medbay" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - -/area/exploration/pathfinder_office - name = "\improper Pathfinder's Office" - nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES - /area/station/protean_nanite_room name = "\improper Nanite Chamber" icon_state = "blue" diff --git a/code/game/area/station/exporation.dm b/code/game/area/station/exporation.dm new file mode 100644 index 000000000000..93e68888e70b --- /dev/null +++ b/code/game/area/station/exporation.dm @@ -0,0 +1,49 @@ +//Exploration areas +/area/exploration + name = "\improper Exploration Foyer" + icon_state = "purple" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS + +/area/exploration/excursion_dock + name = "\improper Excursion Shuttle Dock" + icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/courser_dock + name = "\improper Courser Shuttle Dock" + icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/explorer_prep + name = "\improper Explorer Prep Room" + icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/pilot_prep + name = "\improper Pilot Prep Room" + icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/pilot_Office + name = "\improper Pilot Office" + icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/meeting + name = "\improper Explorer Meeting Room" + icon_state = "northeast" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE + +/area/exploration/showers + name = "\improper Explorer Showers" + icon_state = "restrooms" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE + +/area/exploration/medical + name = "\improper Exploration Med Station" + icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/exploration/pathfinder_office + name = "\improper Pathfinder's Office" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES From dd70c5fe7b2477a13935003e5691bce18d0416ba Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:10:55 +0100 Subject: [PATCH 02/20] and adds the new file to the dme --- citadel.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/citadel.dme b/citadel.dme index c9414d382aa9..2e8529e02048 100644 --- a/citadel.dme +++ b/citadel.dme @@ -955,6 +955,7 @@ #include "code\game\area\Space Station 13 areas.dm" #include "code\game\area\ss13_deprecated_areas.dm" #include "code\game\area\Tether_areas.dm" +#include "code\game\area\station\exporation.dm" #include "code\game\atoms\action_feedback.dm" #include "code\game\atoms\appearance.dm" #include "code\game\atoms\atom.dm" From 8124bb4c16f4765e8ab4b3c0187ee1e910dc2db7 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:13:24 +0100 Subject: [PATCH 03/20] adds a planetary sensor satelite uplink(sensors for planets) --- code/modules/overmap/legacy/sectors.dm | 2 + .../overmap/legacy/ships/computers/sensors.dm | 37 ++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/code/modules/overmap/legacy/sectors.dm b/code/modules/overmap/legacy/sectors.dm index ef79f4d3008d..87cdffd12be2 100644 --- a/code/modules/overmap/legacy/sectors.dm +++ b/code/modules/overmap/legacy/sectors.dm @@ -31,6 +31,8 @@ var/hide_from_reports = FALSE + var/sensors + var/has_distress_beacon var/list/unowned_areas // areas we don't own despite them being present on our z diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index 4daa1aeb0ca4..fcc1ba4daec2 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -14,6 +14,23 @@ icon_screen = "adv_sensors_screen" light_color = "#05A6A8" +/obj/machinery/computer/ship/sensors/planet + name = "Sensor satelite uplinke console" + var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c + +/obj/machinery/computer/ship/sensors/planet/Initialize(mapload) + . = ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/computer/ship/sensors/planet/LateInitialize() + . = ..() + var/area/overmap/map = locate() in world + for(var/obj/overmap/entity/visitable/sector/S in map) + if(istype(S,planet_type)) + linked = S + src.sensors = linked.sensors//Late init to be sure that the sensors have been set on the planet + break + /obj/machinery/computer/ship/sensors/attempt_hook_up(obj/overmap/entity/visitable/ship/sector) if(!(. = ..())) return @@ -150,6 +167,7 @@ var/range = 1 idle_power_usage = 5000 + var/heat_factor = 1 /obj/machinery/shipsensors/attackby(obj/item/W, mob/user) var/damage = max_health - health @@ -223,7 +241,7 @@ take_damage_legacy(rand(10,50)) toggle() - heat += idle_power_usage/15000 + heat += (idle_power_usage/15000) * heat_factor if (heat > 0) heat = max(0, heat - heat_reduction) @@ -254,3 +272,20 @@ /obj/machinery/shipsensors/weak heat_reduction = 0.2 desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." + +/obj/machinery/shipsensors/uplink + name = "sensors uplink" + desc = "A high power up link, connecting to a satelite with a high power sensor array and a sophisticated cooling system." + var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c + heat_factor = 0.1//Much much lower, since we are a cool sensor sat. + +/obj/machinery/shipsensors/uplink/in_vacuum() + return TRUE + +/obj/machinery/shipsensors/uplink/Initialize(mapload) + . = ..() + var/area/overmap/map = locate() in world + for(var/obj/overmap/entity/visitable/sector/S in map) + if(istype(S,planet_type)) + S.sensors = src + From 74a49649722c405270d5683d0b4bb58f495eb001 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:13:53 +0100 Subject: [PATCH 04/20] adds sensors to the rift, adds a pilot office and moves pilot prep there. --- maps/rift/levels/rift-06-surface3.dmm | 1835 ++++++++++++++----------- 1 file changed, 1061 insertions(+), 774 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index fa8c16b12bbf..0b3633c96c2d 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -67,6 +67,7 @@ /obj/effect/floor_decal/corner/lightorange{ dir = 5 }, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/bridge) "aam" = ( @@ -111,25 +112,8 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/hop) "aas" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/turf/simulated/floor/tiled, +/obj/machinery/suit_cycler/exploration, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aat" = ( /obj/structure/sink{ @@ -337,20 +321,14 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "abi" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-10" }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "abk" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 4 @@ -484,22 +462,9 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "abF" = ( -/obj/structure/table/steel, -/obj/machinery/recharger, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/holoposter{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "abG" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -637,9 +602,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -898,11 +860,10 @@ dir = 1; pixel_y = 1 }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; +/obj/machinery/embedded_controller/radio/airlock/docking_port{ id_tag = "expshuttle_dock"; - pixel_y = 26; - req_one_access = list(19,43,67) + frequency = 1380; + pixel_y = 29 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) @@ -1001,6 +962,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "adp" = ( @@ -1145,6 +1109,8 @@ desc = " "; pixel_y = 24 }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "adK" = ( @@ -1372,12 +1338,15 @@ /turf/simulated/floor/tiled/steel, /area/bridge) "aes" = ( -/obj/structure/table/bench/steel, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor{ - dir = 8 + dir = 9 }, /obj/effect/floor_decal/corner/beige/border{ - dir = 8 + dir = 9 }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -1592,13 +1561,10 @@ /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside3) "afg" = ( -/obj/machinery/power/terminal, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-8" - }, +/obj/structure/table/rack/steel, +/obj/random/toolbox, /turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/area/maintenance/bar/lower) "afh" = ( /obj/structure/curtain/open, /turf/simulated/floor/plating, @@ -1719,6 +1685,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "afA" = ( @@ -1965,19 +1934,14 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "agr" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "agt" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -2027,6 +1991,9 @@ /obj/machinery/door/airlock/maintenance/rnd{ req_one_access = list(19,43,67) }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "agB" = ( @@ -2239,11 +2206,23 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "ahj" = ( -/obj/structure/railing, -/obj/structure/table/rack/steel, -/obj/random/powercell, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -27 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacethree) "ahk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -2894,28 +2873,20 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "aiT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aiU" = ( /turf/simulated/floor/tiled/steel, @@ -2995,9 +2966,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "ajd" = ( @@ -3245,18 +3213,13 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "ajR" = ( -/obj/structure/table/bench/steel, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/structure/window/basic{ dir = 8 }, -/obj/machinery/camera/network/exploration{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/item/stool/padded, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "ajS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3264,8 +3227,11 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) "ajT" = ( -/obj/machinery/light, -/obj/landmark/spawnpoint/job/pilot, +/obj/machinery/door/airlock/glass/exploration{ + name = "Explorer Prep"; + req_access = list(); + req_one_access = list(19,43,67) + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "ajU" = ( @@ -3364,17 +3330,8 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/locker/laundry_arrival) "akc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/machinery/power/apc/west_mount, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, /area/exploration/explorer_prep) "akd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3454,11 +3411,8 @@ /turf/simulated/floor/plating, /area/rift/surfaceeva/aa/cliff_north) "akk" = ( -/obj/structure/railing, -/obj/random/toolbox, -/obj/structure/table/rack/steel, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/wall/prepainted/civilian, +/area/exploration/pilot_Office) "akl" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3821,9 +3775,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3976,6 +3927,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "alN" = ( +/obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "alO" = ( @@ -4742,12 +4694,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "anQ" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/landmark/spawnpoint/job/explorer, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "anR" = ( /obj/machinery/door/airlock/voidcraft{ name = "cockpit" @@ -4807,9 +4758,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -5149,9 +5097,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -5413,8 +5358,11 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "apF" = ( -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "apG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5461,6 +5409,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "apO" = ( @@ -5584,6 +5535,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/shipsensors/uplink, /turf/simulated/floor/tiled/dark, /area/bridge) "aqi" = ( @@ -5906,12 +5858,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aqW" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/turf/simulated/wall/prepainted/civilian, +/area/exploration/pilot_prep) "aqX" = ( /obj/machinery/pointdefense_control{ id_tag = "s3north" @@ -6004,7 +5952,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "ark" = ( -/obj/landmark/spawnpoint/job/pilot, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "arl" = ( @@ -6116,6 +6066,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "arA" = ( @@ -6169,10 +6122,15 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "arC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/beige/border, +/turf/simulated/floor/tiled/steel, /area/exploration) "arD" = ( /obj/machinery/ai_slipper, @@ -6230,11 +6188,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"arM" = ( -/obj/structure/bed/chair/comfy/brown, -/obj/landmark/spawnpoint/job/explorer, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) "arO" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 @@ -6648,16 +6601,11 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "asV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, /obj/structure/closet/hydrant{ dir = 4; pixel_x = 32 }, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "atb" = ( @@ -6743,29 +6691,10 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "atm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, /obj/machinery/light{ dir = 1 }, -/obj/structure/window/reinforced/tinted/frosted, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/wall/prepainted/exploration, /area/exploration) "atn" = ( /obj/overmap/entity/visitable/sector/lythios43c, @@ -6842,6 +6771,9 @@ }, /obj/structure/window/reinforced/tinted/frosted, /obj/machinery/camera/network/exploration, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/exploration) "atz" = ( @@ -6873,6 +6805,7 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "atD" = ( @@ -7381,21 +7314,19 @@ /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) "auX" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Research Shuttles Subgrid"; + name_tag = "Research Shuttles Subgrid" }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/exploration) +/turf/simulated/floor/plating, +/area/maintenance/substation/exploration) "auZ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -7475,12 +7406,24 @@ /turf/simulated/floor/wood, /area/bridge/bunker) "avn" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/landmark/spawnpoint/job/field_medic, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) +/obj/structure/table/rack/shelf, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "avp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7565,13 +7508,22 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "avx" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/paper{ - info = "WHERE THE FUCK IS THE PHORON CAN?! WHO DIDN'T RETURN IT?!"; - name = "note" +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacethree) "avy" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -7956,21 +7908,17 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aws" = ( -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Research Shuttles Subgrid"; - name_tag = "Research Shuttles Subgrid" - }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/camera/network/civilian{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/turf/simulated/floor/tiled/steel, +/area/hydroponics) "awt" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload Access"; @@ -8001,22 +7949,20 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) "aww" = ( -/obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/exploration) +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "awx" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -8352,23 +8298,9 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "axe" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/beige/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 9 - }, -/obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -25 - }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/machinery/suit_storage_unit/exploration, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "axf" = ( /obj/machinery/computer/power_monitor, /obj/effect/floor_decal/corner/lightorange{ @@ -8828,6 +8760,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ayu" = ( @@ -8877,10 +8812,6 @@ /obj/structure/railing, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) -"ayD" = ( -/obj/landmark/spawnpoint/job/pathfinder, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) "ayE" = ( /obj/random/trash, /turf/simulated/floor/plating, @@ -9191,9 +9122,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "azw" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/machinery/door/window/westleft, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "azx" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -9273,6 +9204,7 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "azG" = ( @@ -9310,11 +9242,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"azN" = ( -/obj/structure/bed/chair/comfy/brown, -/obj/landmark/spawnpoint/job/field_medic, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) "azO" = ( /obj/item/aiModule/nanotrasen, /obj/structure/table/standard, @@ -9565,9 +9492,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9915,14 +9839,14 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "aBQ" = ( +/obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/beige/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/beige/bordercorner2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "aBS" = ( @@ -10206,6 +10130,12 @@ "aCF" = ( /obj/structure/table/bench/wooden, /obj/landmark/spawnpoint/job/botanist, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aCG" = ( @@ -10556,6 +10486,12 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) "aDP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aDR" = ( @@ -10825,6 +10761,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aEM" = ( @@ -10944,9 +10883,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -11002,10 +10938,9 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "aFg" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/closet/secure_closet/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "aFh" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -11017,22 +10952,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aFj" = ( -/obj/machinery/light/small, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Exploration and Research Shuttles"; - output_attempt = 0 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/area/maintenance/bar/lower) "aFl" = ( /obj/machinery/conveyor_switch/oneway{ id = "shuttle_outbound" @@ -11069,24 +10994,12 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/emt/general) "aFq" = ( -/obj/machinery/disposal, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "aFu" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, @@ -11244,6 +11157,7 @@ dir = 4 }, /obj/machinery/fire_alarm/east_mount, +/obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/steel, /area/exploration) "aFL" = ( @@ -11303,6 +11217,9 @@ /obj/structure/disposalpipe/junction/flipped{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) "aFY" = ( @@ -12182,13 +12099,16 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aIr" = ( -/obj/structure/closet/crate, -/obj/random/coin, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, +/obj/machinery/power/smes/buildable{ + RCon_tag = "Substation - Exploration and Research Shuttles"; + output_attempt = 0; + inputting = 1 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/area/maintenance/substation/exploration) "aIt" = ( /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/plating, @@ -12367,10 +12287,8 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIS" = ( -/obj/structure/bed/chair/comfy/brown, -/obj/landmark/spawnpoint/job/pilot, -/turf/simulated/floor/carpet/purcarpet, -/area/exploration/meeting) +/turf/simulated/wall/prepainted/exploration, +/area/exploration/pilot_prep) "aIT" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 8 @@ -12509,16 +12427,14 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "aJm" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/beige/border, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/machinery/camera/network/exploration{ - dir = 1 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "aJn" = ( /obj/machinery/ai_slipper, /turf/simulated/floor/tiled/techfloor/grid, @@ -12783,6 +12699,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aJR" = ( @@ -12885,10 +12804,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aKd" = ( -/obj/random/trash, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/west_mount, +/obj/structure/bed/chair/bay/comfy/black, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "aKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -13157,7 +13079,6 @@ "aKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, @@ -13201,8 +13122,7 @@ /obj/machinery/holoposter{ pixel_y = 32 }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics) "aLa" = ( /obj/structure/cable/green{ @@ -13354,25 +13274,17 @@ /turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfaceeva/aa/cliff_south) "aLw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aLz" = ( /obj/structure/table/steel_reinforced, @@ -13572,13 +13484,16 @@ /area/shuttle/courser/general) "aMj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 5 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 1 + dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) @@ -13586,9 +13501,8 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "aMm" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "aMn" = ( /obj/effect/floor_decal/industrial/halfstair, /obj/structure/railing{ @@ -13631,9 +13545,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "1-2" @@ -13641,18 +13552,7 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aMr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 1 - }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aMs" = ( @@ -13954,10 +13854,7 @@ /area/crew_quarters/bar) "aNp" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-4" }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -14164,37 +14061,25 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aNV" = ( -/obj/machinery/camera/network/engineering{ +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/power/breakerbox/activated{ - RCon_tag = "Exploration and Research Shuttles Substation Bypass" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) -"aNW" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/machinery/camera/network/exploration{ - dir = 8 - }, /turf/simulated/floor/tiled, +/area/exploration/pilot_prep) +"aNW" = ( +/obj/item/tool/wrench, +/obj/structure/table/steel, +/obj/item/tool/screwdriver, +/obj/item/duct_tape_roll, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aNX" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -14328,11 +14213,11 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "aOm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/exploration) "aOn" = ( @@ -14355,6 +14240,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aOq" = ( @@ -14710,9 +14598,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -14805,12 +14690,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aPF" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/random/fishing_junk, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "aPJ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -14912,6 +14796,7 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "aPV" = ( @@ -15117,22 +15002,11 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside3) "aQr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ dir = 8; pixel_x = 30 }, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aQs" = ( @@ -15242,9 +15116,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, @@ -15413,7 +15284,6 @@ /obj/structure/bed/chair/bay/comfy/black{ dir = 1 }, -/obj/landmark/spawnpoint/job/chief_engineer, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -15470,6 +15340,7 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "aRx" = ( @@ -15496,6 +15367,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aRz" = ( @@ -15535,6 +15409,12 @@ pixel_x = 24; range = 10 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aRE" = ( @@ -15689,6 +15569,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aSf" = ( @@ -16103,19 +15986,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aTd" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/pilot, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aTf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -16517,10 +16398,12 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/structure/table/standard{ - name = "plastic table frame" +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/stack/material/sandstone{ + amount = 5 }, -/obj/item/multitool, +/obj/item/storage/belt/utility, +/obj/item/shovel/spade, /turf/simulated/floor/tiled, /area/hydroponics) "aUr" = ( @@ -16559,9 +16442,12 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/shuttle) "aUv" = ( -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/steel, -/area/hydroponics) +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "aUy" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -16649,6 +16535,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aUF" = ( @@ -16813,6 +16702,7 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, +/obj/item/multitool, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aVh" = ( @@ -16857,9 +16747,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -16926,14 +16813,14 @@ /obj/item/stack/material/sandstone{ amount = 5 }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/corner/lime/border{ + dir = 5 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -16951,8 +16838,6 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aVy" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, /obj/machinery/requests_console{ announcementConsole = 1; department = "Bridge"; @@ -16966,6 +16851,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 10 }, +/obj/machinery/computer/ship/sensors/planet, /turf/simulated/floor/tiled/dark, /area/bridge) "aVz" = ( @@ -17243,11 +17129,8 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/shuttle) "aWA" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "aWB" = ( /obj/machinery/power/apc/south_mount, /obj/machinery/light, @@ -17368,12 +17251,10 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, -/obj/structure/table/rack/shelf, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration/alt, -/obj/item/clothing/head/helmet/space/void/exploration/alt, +/obj/machinery/suit_storage_unit/search_and_rescue{ + helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/medical/alt_plated; + suit_stored_TYPE = /obj/item/clothing/suit/space/void/medical/alt_plated + }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "aWR" = ( @@ -17707,10 +17588,18 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/courser/cockpit) "aXQ" = ( -/obj/structure/table/rack, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/machinery/camera/network/exploration{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "aXR" = ( /obj/structure/closet/secure_closet/hop, /obj/item/megaphone, @@ -17772,11 +17661,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aXY" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/exploration) +/obj/structure/table/wooden_reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/carpet/purcarpet, +/area/exploration/meeting) "aXZ" = ( /obj/machinery/light{ dir = 1 @@ -17861,6 +17749,12 @@ dir = 4; pixel_x = 12 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aYp" = ( @@ -18460,6 +18354,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bfN" = ( @@ -18467,23 +18364,11 @@ /turf/simulated/floor/plating, /area/shuttle/emt/cockpit) "bis" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/window/basic{ + pixel_y = -7 }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacethree) +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "bjs" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/bar) @@ -18541,6 +18426,12 @@ "bqs" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway) +"bqH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "brl" = ( /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) @@ -18886,6 +18777,13 @@ }, /turf/simulated/wall/prepainted, /area/bridge/bunker) +"cye" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/air_alarm/west_mount, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "czm" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -18988,6 +18886,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/fuel{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "cQT" = ( @@ -19021,6 +18922,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"cWu" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "cYb" = ( /obj/machinery/door/airlock/multi_tile/glass/civilian{ dir = 4 @@ -19056,6 +18963,12 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"dan" = ( +/obj/item/modular_computer/console/preset/civilian{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "dcy" = ( /obj/structure/table/wooden_reinforced, /obj/item/storage/photo_album{ @@ -19347,6 +19260,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) +"dVA" = ( +/obj/structure/bed/chair/bay/comfy/black, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "dWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19410,12 +19327,10 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "ebz" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "edo" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/telescience_lab/chamber) @@ -19428,6 +19343,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "egu" = ( @@ -19828,6 +19746,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/bar) +"eOV" = ( +/obj/machinery/fire_alarm/east_mount, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "ePV" = ( /obj/landmark/away, /obj/machinery/holopad, @@ -20203,6 +20128,15 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"fPu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/exploration) "fPD" = ( /obj/machinery/light/small, /obj/random/trash_pile, @@ -20220,6 +20154,15 @@ "fRp" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/trade_shop/landing_pad) +"fRT" = ( +/obj/machinery/door/airlock/maintenance/engi{ + req_one_access = list(10, 67) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/exploration/pilot_prep) "fSv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20291,11 +20234,9 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( -/obj/effect/debris/cleanable/cobweb2, -/obj/random/fishing_junk, -/obj/structure/table/rack/steel, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20314,10 +20255,11 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "gcc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ghf" = ( @@ -20426,11 +20368,12 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "gtg" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/exploration/courser_dock) +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "gtI" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20447,15 +20390,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) @@ -20575,6 +20516,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"gPk" = ( +/obj/machinery/computer/ship/sensors/planet{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "gTy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20802,6 +20749,23 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"hCM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel, +/area/exploration/excursion_dock) "hCW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20980,6 +20944,20 @@ "hXj" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) +"hYK" = ( +/obj/machinery/suit_cycler/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "hZy" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 1 @@ -21133,9 +21111,6 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/plating, /area/exploration) "ivw" = ( @@ -21208,6 +21183,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"iCS" = ( +/obj/machinery/camera/network/engineering{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/substation/exploration) "iEp" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -21298,6 +21283,13 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"iRO" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "iXB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -21338,6 +21330,21 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"jay" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm/south_mount, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacethree) "jbk" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ dir = 1; @@ -21377,6 +21384,7 @@ name = "Exploration Airlock"; req_one_access = list(19,43,67) }, +/obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) "jiv" = ( @@ -21394,6 +21402,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) +"jlx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "jmj" = ( /obj/machinery/light/small{ dir = 4 @@ -21434,9 +21452,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -21508,12 +21523,12 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jyZ" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable{ +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/area/exploration/pilot_Office) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21553,10 +21568,12 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "jFJ" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Exploration"; - sortType = "Exploration" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -21592,6 +21609,9 @@ /obj/machinery/door/airlock/multi_tile/glass/exploration{ req_one_access = list(19,43,67) }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "jHi" = ( @@ -21692,12 +21712,6 @@ "jNZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/beige/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 9 - }, /obj/machinery/door/firedoor/glass{ dir = 8 }, @@ -22010,6 +22024,18 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/holoposter{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "kRX" = ( @@ -22051,15 +22077,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/exploration{ dir = 1; name = "Exploration Airlock"; req_one_access = list(19,43,67) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -22217,6 +22243,16 @@ /obj/item/clothing/accessory/hawaii/random, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"lAT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table/woodentable, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "lDX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -22238,6 +22274,15 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) +"lJp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/surfacethree) "lJM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22263,12 +22308,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 6 - }, /obj/machinery/power/port_gen/pacman/mrs{ anchored = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "lKG" = ( @@ -22342,12 +22385,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/fuel, -/obj/machinery/atmospherics/component/unary/heater{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/machinery/atmospherics/component/unary/heater{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "lSn" = ( @@ -22381,6 +22424,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"lSR" = ( +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Exploration" + }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "lWu" = ( /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ @@ -22402,6 +22454,10 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) +"lWV" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, +/area/exploration/pilot_Office) "lXf" = ( /obj/structure/railing{ dir = 8 @@ -22466,6 +22522,19 @@ "lZM" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/meeting) +"maI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/exploration{ + dir = 1; + name = "Exploration Airlock"; + req_one_access = list(19,43,67) + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/excursion_dock) "mbP" = ( /obj/structure/bed/padded, /obj/effect/debris/cleanable/fruit_smudge, @@ -22647,6 +22716,14 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) +"mBV" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access"; @@ -22900,7 +22977,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "nfJ" = ( -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/civilian, /area/hallway/primary/surfacethree) "nfS" = ( /obj/machinery/door/firedoor/glass{ @@ -22932,6 +23009,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar) +"njG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "nlb" = ( /obj/machinery/computer/cryopod/robot{ dir = 1; @@ -22944,6 +23027,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) +"nms" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23034,6 +23123,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"nFC" = ( +/obj/machinery/power/breakerbox{ + RCon_tag = "Exploration and Research Shuttles Substation Bypass" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/exploration) "nGT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorblack/corner{ @@ -23055,7 +23150,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 1 }, @@ -23088,6 +23182,15 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"nOb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "nQb" = ( /obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/plating, @@ -23112,6 +23215,13 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) +"nXs" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/maintenance/substation/exploration) "nYu" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -23153,6 +23263,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"oeA" = ( +/obj/structure/table/woodentable, +/obj/machinery/chemical_dispenser/catering/bar_soft{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "ofq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -23279,12 +23396,14 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxz" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/exploration/courser_dock) +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "oAw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23371,6 +23490,12 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"oJt" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/exploration/excursion_dock) "oJN" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, @@ -23455,9 +23580,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "oWw" = ( @@ -23516,6 +23638,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) +"pis" = ( +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Exploration"; + sortType = "Exploration" + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "pjG" = ( /obj/machinery/light{ dir = 4 @@ -23598,6 +23734,11 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"ptn" = ( +/obj/structure/table/woodentable, +/obj/item/storage/box/glasses/meta, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "pul" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -23831,10 +23972,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "qcL" = ( -/obj/random/trash_pile, -/obj/effect/debris/cleanable/cobweb, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -23975,6 +24114,26 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"qnC" = ( +/obj/structure/table/rack/shelf, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "qnV" = ( /obj/structure/cable{ icon_state = "2-4" @@ -24428,14 +24587,14 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "rMs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/beige/border, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/tiled/steel, +/area/exploration) "rMH" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel"; @@ -24506,6 +24665,20 @@ }, /turf/simulated/open, /area/rnd/telescience_lab) +"rZH" = ( +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "scN" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -24545,6 +24718,16 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"sei" = ( +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/light{ + light_range = 12 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "slu" = ( /obj/structure/railing{ dir = 4 @@ -24762,6 +24945,12 @@ /obj/effect/paint/violet, /turf/simulated/floor/plating, /area/exploration/excursion_dock) +"tdn" = ( +/obj/structure/cable/green{ + icon_state = "1-6" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "tfz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -24806,6 +24995,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab) +"tnN" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "tnR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24902,6 +25097,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"tAU" = ( +/obj/structure/table/rack/steel, +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "tCt" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, @@ -25161,7 +25361,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/visible/fuel, /obj/machinery/atmospherics/pipe/simple/visible/aux, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, @@ -25184,13 +25383,11 @@ /turf/simulated/floor/plating, /area/shuttle/emt/general) "use" = ( -/obj/structure/closet/coffin, -/obj/random/trash, -/obj/random/contraband, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "uxa" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -25210,6 +25407,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"uxD" = ( +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/structure/table/rack/shelf, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "uyj" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, @@ -25226,22 +25439,24 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) "uAA" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 }, -/turf/simulated/floor/tiled, +/obj/item/duct_tape_roll, +/obj/structure/table/steel, +/obj/item/storage/single_use/med_pouch/burn, +/obj/item/storage/single_use/med_pouch/oxyloss, +/obj/item/storage/single_use/med_pouch/toxin, +/obj/item/storage/single_use/med_pouch/radiation, +/obj/item/storage/single_use/med_pouch/trauma, +/obj/item/storage/single_use/med_pouch/trauma, +/obj/item/storage/single_use/med_pouch/radiation, +/obj/item/gun/ballistic/shotgun/flare/explo, +/obj/item/storage/box/flashshells, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "uCG" = ( /obj/machinery/door/blast/shutters{ @@ -25297,10 +25512,10 @@ dir = 6 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) @@ -25391,7 +25606,8 @@ "uTt" = ( /obj/machinery/door/airlock/exploration{ name = "Exploration Airlock"; - req_one_access = list(19,43,67) + req_one_access = list(19,43,67); + locked = 1 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) @@ -25410,6 +25626,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"uTP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "5-9" + }, +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "uVz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -25645,6 +25873,15 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) +"vwM" = ( +/obj/structure/table/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/paper{ + info = "WHERE THE FUCK IS THE PHORON CAN?! WHO DIDN'T RETURN IT?!"; + name = "note" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "vwQ" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/heads/hop) @@ -25716,6 +25953,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vCA" = ( @@ -25847,11 +26087,12 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vOW" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/bed/chair/comfy/brown{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/wood, +/area/exploration/pilot_prep) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25880,6 +26121,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"vUc" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "vVw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -26062,6 +26309,22 @@ "wnH" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bridge_hallway) +"wos" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/exploration{ + dir = 1; + name = "Exploration Airlock"; + req_one_access = list(19,43,67) + }, +/obj/map_helper/airlock/door/ext_door, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/excursion_dock) "woK" = ( /obj/machinery/status_display, /turf/simulated/wall/prepainted/civilian, @@ -26123,6 +26386,13 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"wyq" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "wzN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26239,6 +26509,13 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/meeting_room) +"wUC" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "wZh" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/palebottlegreen, @@ -26263,15 +26540,25 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xbb" = ( -/obj/machinery/door/firedoor/glass{ +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/obj/machinery/camera/network/exploration{ dir = 1 }, -/obj/machinery/door/airlock/glass/exploration{ - name = "Pilot Prep"; - req_access = list(67) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/beige/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/exploration) "xbo" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -26346,12 +26633,12 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xuc" = ( -/obj/structure/catwalk, -/obj/structure/cable{ +/obj/machinery/fire_alarm/east_mount, +/obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "xug" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -39668,7 +39955,7 @@ sny aTv atT aks -aUi +avH alj cnu adx @@ -41785,15 +42072,15 @@ aPk anE aWg jpv -aWg +tLm jJw nYS kaE aRD aYo +aws aDP aDP -aUv aCF alN aVf @@ -41979,15 +42266,15 @@ aXM suT aWg jpv -aWg +tLm jZv nfJ cIq cIq cIq aKZ -aDP -abi +cIq +cIq aVv aUp aJx @@ -42173,14 +42460,14 @@ aNC tCt aWg jpv -aWg -bis -cnu -use +tLm +bON +nOb +anQ aKd -cIq -cIq -cIq +lAT +vUc +gPk cIq cIq cIq @@ -42188,11 +42475,11 @@ cIq cIq cnu vuT -cnu -cnu -cnu -cnu -cnu +alk +alk +alk +alk +alk adx aus uQv @@ -42367,26 +42654,26 @@ aXM anE aWg jpv -aWg -vMY -cnu -cnu -cnu -aih -alk -alk -alk -alk -aUi -aUi -aMm -aUi +tLm +ahj +akk +aWA +dVA +fVL +jlx +dan +akk +rZH +iRO +qnC +aqW +arS aTv -cnu -aUi +aih +nFC aIr -avH -cnu +iCS +alk adx aus eor @@ -42396,9 +42683,9 @@ aoS eor aEO aXt -aXt awU aXt +aXt ayv lxt aKL @@ -42561,26 +42848,26 @@ aPk suT aWg jpv -aWg +tLm vMY -cnu -qcL -arS -alk +lWV +aWA +dVA +fVL apF aWA +akk +aww +aMm aNV +aqW +tAU +aUv +aEW +fPu +nXs +auX alk -arS -aUi -ahj -aUi -aTv -cnu -cnu -cnu -cnu -cnu axz aus eor @@ -42755,26 +43042,26 @@ gqJ avG aWg aaQ -aWg -bON +lJp +avx jyZ +mBV xuc -xuc -aEW -aXY +tdn +apF +aWA +akk +rZH +aMm +hYK +aqW afg -aFj +aFq +alk +alk +alk +aje alk -aUi -aUi -akk -aUi -aTv -cnu -aFg -aXf -aXQ -avx axz aus asd @@ -42951,30 +43238,30 @@ aWg aaQ aWg bNg -cnu -aUi -aTv -alk -apF -aqW -aws -alk +akk +akk +akk +akk +uTP +akk +akk +ajR azw -aUi -aUi -aUi -aTv +sei +aqW +wyq +aFq cnu adJ -aUi -aUi -aUi +aXf +tnN +vwM axz aBl rAi rAi jil -laR +wos rAi rAi aus @@ -43144,25 +43431,25 @@ aYO aWg aaQ aWg -vMY -cnu +jay +aqW vOW -aTv -alk -alk -alk -aje -alk +cye +abi +nms +use +gtg +oxz aPF -aUi -aUi -aTv -aTv +aPF +fRT +njG +wUC aGm aTv aTv -aTv -aTv +tAt +aiR axz ame tbF @@ -43339,24 +43626,24 @@ uEE rEc uEE hAq -cnu -fVL -aTv -aTv -aTv -aTv -tAt -ebz -ebz -ebz +aqW +abF +abF +bqH +qcL +qcL +bis +aFg ebz -aiR +aFg +aqW +aUi aCQ ung ung ung ung -aTv +aFj axz acH rAi @@ -43533,14 +43820,14 @@ aHV aaQ aWg fVI -veT -veT -veT -veT -veT -veT -veT -veT +aqW +cWu +cWu +eOV +lSR +ptn +oeA +aIS veT veT veT @@ -43550,7 +43837,7 @@ ung abm abm ung -aTv +aFj axz acH tbF @@ -43729,12 +44016,12 @@ nSh wdZ veT atm -auX -aww veT -aFq -abF -ajR +veT +veT +veT +veT +veT aes aAb arm @@ -43749,7 +44036,7 @@ wAD rAi rAi rAi -jil +maI laR ncw rAi @@ -43928,8 +44215,8 @@ okY tpD jFJ kOx -egu -egu +aXQ +pis egu egu aJw @@ -43938,7 +44225,7 @@ bnN vpx iEp jGy -aiU +oJt akN akU akY @@ -44132,7 +44419,7 @@ aDU aAB apm ahh -aYw +hCM ali awE aYw @@ -44156,7 +44443,7 @@ aHZ aHZ aHZ aHp -gtg +aYe cvI afq afq @@ -44350,7 +44637,7 @@ aNi aNi aXO aHp -oxz +aoO cvI afq afq @@ -44519,11 +44806,11 @@ lZM qnv pnT jNZ -dIa +hXj uAA aTd -aTd -aTd +aFY +aul hXj mHn mHn @@ -44544,7 +44831,7 @@ aOZ aWq aYW aHp -gtg +aYe cvI afq afq @@ -44712,12 +44999,12 @@ asU lZM ayt aOp -arf -xbb -aAq -ark +arC +jpO +aLw ark -ajT +arc +aIj hXj aHv aHv @@ -44738,7 +45025,7 @@ aUa aWu aZr aHp -gtg +aYe cvI afq afq @@ -44899,19 +45186,19 @@ lZM aFR aIi jEm -ayD +aIi aIi aHJ aDT lZM aiZ aeh -aAH +aiY dIa agr -aLw -aNW -aLw +aAq +arc +aJv hXj aHv aHv @@ -44932,7 +45219,7 @@ aUP aWB aOZ aHp -oxz +aoO cvI afq afq @@ -45091,21 +45378,21 @@ aum azj lZM adX -aIS +adg ahb -aaJ +aXY aQm aHJ aPQ sON awO agW -awh -hXj -hXj -hXj -hXj +xbb hXj +aiT +aAq +arc +aJv hXj aZW aZW @@ -45126,7 +45413,7 @@ aOZ aWD aHB aHB -gtg +aYe cvI afq afq @@ -45285,21 +45572,21 @@ aqT ayy lZM aBO -arM +adg azp aLI -avn +aQm aHJ aFV sON awO agW -aJm -hXj -aas -akc -aFY -aul +arf +hRh +aAq +aAq +awi +alw hXj aZW aZW @@ -45320,7 +45607,7 @@ aDL aWM aZI arA -gtg +aYe cvI afq afq @@ -45479,21 +45766,21 @@ qDv aXs lZM aFR -azN +adg ahb aaJ -anQ +aQm aHJ aiS lZM ajc -arC +agW aBQ -jpO -aiT +hXj +auT aMj -arc -aIj +aJm +ahq hXj aCt aFf @@ -45682,12 +45969,12 @@ ajg lZM awO agW -aiY -dIa -aas rMs -arc -aJv +hXj +hXj +hXj +hXj +hXj hXj acI alF @@ -45876,12 +46163,12 @@ mpX mpX awO agW -axe -hXj +aXG +akc aas aMr -arc -aJv +uxD +aNW hXj aZk axm @@ -46071,11 +46358,11 @@ mpX awO agW arf -hRh +ajT +aAq +aAq aAq aAq -awi -alw hXj aSG aJo @@ -46265,11 +46552,11 @@ igJ awO agW aAH -hXj -auT +akc +axe aQr asV -ahq +axe hXj jew axm @@ -47240,7 +47527,7 @@ aDo aUz aWQ aWQ -hXj +avn hXj aif aKt @@ -47435,7 +47722,7 @@ hXj hXj hXj hXj -aKt +fhj aif aKt pxw From 0ef7a4aef5d94b7b1279e1e4db5b9593471d7c89 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:34:02 +0100 Subject: [PATCH 05/20] some flavour --- maps/rift/levels/rift-06-surface3.dmm | 328 ++++++++++++++++---------- 1 file changed, 205 insertions(+), 123 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 0b3633c96c2d..ddb33a2ac1dd 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -463,7 +463,9 @@ /area/hallway/secondary/docking_hallway2) "abF" = ( /obj/structure/table/woodentable, -/turf/simulated/floor/wood, +/obj/random/carp_plushie, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/blue, /area/exploration/pilot_prep) "abG" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -599,9 +601,6 @@ "abZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -925,6 +924,12 @@ dir = 1 }, /obj/machinery/computer/timeclock/premade/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "adj" = ( @@ -2221,6 +2226,9 @@ dir = 1; pixel_y = -27 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "ahk" = ( @@ -2334,7 +2342,11 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 4; + name = "Security Checkpoint"; + sortType = "Security Checkpoint" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "ahy" = ( @@ -3097,9 +3109,6 @@ /area/maintenance/station/exploration) "ajA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -4624,6 +4633,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "anH" = ( @@ -5379,13 +5394,10 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "apI" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 4; - name = "Security Checkpoint"; - sortType = "Security Checkpoint" - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) +/obj/structure/table/woodentable, +/obj/random/carp_plushie, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "apK" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -7522,6 +7534,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "avy" = ( @@ -7628,6 +7643,12 @@ /obj/machinery/holoposter{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "avH" = ( @@ -7942,12 +7963,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "awu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/blue, +/area/exploration/pilot_prep) "aww" = ( /obj/machinery/suit_storage_unit/pilot, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -11214,11 +11232,8 @@ /turf/simulated/floor/lythios43c/indoors, /area/maintenance/commandmaint) "aFX" = ( -/obj/structure/disposalpipe/junction/flipped{ - dir = 8 - }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) @@ -11920,12 +11935,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) -"aHV" = ( -/obj/structure/disposalpipe/junction/flipped{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) "aHW" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -13333,6 +13342,9 @@ "aLI" = ( /obj/structure/table/wooden_reinforced, /obj/item/material/ashtray/glass, +/obj/item/toy/plushie/petrock{ + name = "\improper Steve" + }, /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "aLJ" = ( @@ -17693,6 +17705,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "aYe" = ( @@ -17961,6 +17976,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "aYP" = ( @@ -18551,6 +18569,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bON" = ( @@ -18568,6 +18589,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bPD" = ( @@ -18731,6 +18755,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "cqU" = ( @@ -18782,7 +18810,8 @@ dir = 4 }, /obj/machinery/air_alarm/west_mount, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/blue, /area/exploration/pilot_prep) "czm" = ( /obj/structure/disposalpipe/trunk{ @@ -18926,7 +18955,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/blue, /area/exploration/pilot_prep) "cYb" = ( /obj/machinery/door/airlock/multi_tile/glass/civilian{ @@ -19121,10 +19150,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "dDb" = ( @@ -19458,6 +19490,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "ewE" = ( @@ -19684,6 +19719,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "eKt" = ( @@ -20231,6 +20269,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( @@ -20716,6 +20757,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "hAM" = ( @@ -20992,7 +21036,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) @@ -21343,6 +21388,9 @@ icon_state = "4-8" }, /obj/machinery/air_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jbk" = ( @@ -21520,6 +21568,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jyZ" = ( @@ -21527,6 +21579,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_Office) "jBo" = ( @@ -21640,6 +21693,9 @@ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jIg" = ( @@ -21649,15 +21705,16 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jJn" = ( @@ -21675,6 +21732,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jLf" = ( @@ -21803,6 +21863,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jZk" = ( @@ -21824,6 +21887,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jZP" = ( @@ -22064,6 +22130,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "kZx" = ( @@ -22163,6 +22232,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "loG" = ( @@ -22251,6 +22323,8 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "lDX" = ( @@ -22275,14 +22349,12 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "lJp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/bed/chair/comfy/brown{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/blue, +/area/exploration/pilot_prep) "lJM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22456,6 +22528,7 @@ /area/security/checkpoint2) "lWV" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_Office) "lXf" = ( @@ -22722,6 +22795,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/mob/living/simple_mob/animal/passive/snake/noodle, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "mCR" = ( @@ -23054,13 +23128,14 @@ /area/rift/surfaceeva/airlock/arrivals/secondary) "nna" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) "noy" = ( @@ -23195,14 +23270,6 @@ /obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/plating, /area/rift/turbolift/maint) -"nSh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) "nVs" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -23261,6 +23328,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "oeA" = ( @@ -23736,7 +23806,10 @@ /area/shuttle/emt/general) "ptn" = ( /obj/structure/table/woodentable, -/obj/item/storage/box/glasses/meta, +/obj/item/storage/box/glasses/meta{ + pixel_y = -11 + }, +/obj/machinery/recharger, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "pul" = ( @@ -23758,18 +23831,6 @@ }, /turf/simulated/floor/plating, /area/bridge/bunker) -"pvZ" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacethree) "pwb" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, @@ -24495,6 +24556,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "run" = ( @@ -24768,6 +24832,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "swD" = ( @@ -25104,6 +25174,12 @@ /area/maintenance/bar/lower) "tCt" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "tEl" = ( @@ -25150,10 +25226,12 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/junction/flipped{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "tHW" = ( @@ -25206,9 +25284,6 @@ /turf/simulated/floor/plating, /area/security/checkpoint2) "tLm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -25471,17 +25546,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "uEE" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacethree) +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "uGZ" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ dir = 1; @@ -25926,6 +25993,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vzp" = ( @@ -25949,13 +26019,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction/flipped{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vCA" = ( @@ -26084,6 +26156,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vOW" = ( @@ -26091,7 +26166,7 @@ dir = 4 }, /obj/landmark/spawnpoint/job/pilot, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/blue, /area/exploration/pilot_prep) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26242,6 +26317,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "wec" = ( @@ -26818,6 +26896,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "xLz" = ( @@ -41100,9 +41182,9 @@ api api api ahx -apI aaQ -aWg +aaQ +aaQ eJQ kaE qJf @@ -41294,9 +41376,9 @@ jiv jiv jiv jWV -pvZ bnc -pvZ +bnc +bnc lnn cIq cIq @@ -41488,9 +41570,9 @@ aCu aCu vlJ aYc -aWg aaQ -aWg +aaQ +aaQ kVd dfy kaE @@ -41682,9 +41764,9 @@ aCu aCu vlJ aYO -aWg aaQ -aWg +aaQ +aaQ vyL guk kaE @@ -41876,8 +41958,8 @@ gqJ gqJ gqJ adi -aWg -aaQ +aFX +aFX aFX vzZ bfe @@ -42070,9 +42152,9 @@ aXM aXM aPk anE -aWg jpv -tLm +jpv +jpv jJw nYS kaE @@ -42264,9 +42346,9 @@ aBU aBU aXM suT -aWg jpv -tLm +jpv +jpv jZv nfJ cIq @@ -42458,9 +42540,9 @@ aBU aBU aNC tCt -aWg jpv -tLm +jpv +jpv bON nOb anQ @@ -42652,9 +42734,9 @@ aBU aBU aXM anE -aWg jpv -tLm +jpv +jpv ahj akk aWA @@ -42846,16 +42928,16 @@ aXM aXM aPk suT -aWg jpv -tLm +jpv +jpv vMY lWV aWA dVA -fVL +apI apF -aWA +uEE akk aww aMm @@ -43040,9 +43122,9 @@ gqJ gqJ gqJ avG -aWg -aaQ -lJp +aFX +aFX +aFX avx jyZ mBV @@ -43234,9 +43316,9 @@ aCu aCu vlJ aYc -aWg aaQ -aWg +aaQ +aaQ bNg akk akk @@ -43428,9 +43510,9 @@ aCu aCu vlJ aYO -aWg aaQ -aWg +aaQ +aaQ jay aqW vOW @@ -43622,12 +43704,12 @@ jiv jiv jiv jHq -uEE rEc -uEE +rEc +rEc hAq aqW -abF +awu abF bqH qcL @@ -43816,13 +43898,13 @@ amf amf ajC tHQ -aHV aaQ -aWg +aaQ +aaQ fVI aqW cWu -cWu +lJp eOV lSR ptn @@ -44012,7 +44094,7 @@ uMf xKM icY eoD -nSh +eoD wdZ veT atm @@ -44206,7 +44288,7 @@ bWN vEd aIk aaQ -awu +aaQ dCB tpD gcc From 75dc512d92d980dc65bb2f79fea64f97cca79803 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Sat, 27 Jan 2024 15:19:18 +0100 Subject: [PATCH 06/20] fix spelling mistakes --- code/modules/overmap/legacy/ships/computers/sensors.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index fcc1ba4daec2..b8da4f51c558 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -15,7 +15,7 @@ light_color = "#05A6A8" /obj/machinery/computer/ship/sensors/planet - name = "Sensor satelite uplinke console" + name = "Sensor satelite uplink console" var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c /obj/machinery/computer/ship/sensors/planet/Initialize(mapload) @@ -275,7 +275,7 @@ /obj/machinery/shipsensors/uplink name = "sensors uplink" - desc = "A high power up link, connecting to a satelite with a high power sensor array and a sophisticated cooling system." + desc = "A high power uplink, connecting to a satelite with a high power sensor array and a sophisticated cooling system." var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c heat_factor = 0.1//Much much lower, since we are a cool sensor sat. From babd12206edd09c48301ff64d9d1377536784422 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Sun, 28 Jan 2024 21:16:50 +0100 Subject: [PATCH 07/20] treats for noodle and a holopad --- maps/rift/levels/rift-06-surface3.dmm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index ddb33a2ac1dd..d6762de94d2d 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -18448,6 +18448,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/holopad/ship, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "brl" = ( @@ -20276,6 +20277,7 @@ /area/hallway/primary/surfacethree) "fVL" = ( /obj/structure/table/woodentable, +/obj/item/storage/box/snakesnackbox, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "gaF" = ( @@ -25597,6 +25599,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"uMP" = ( +/obj/structure/flora/pottedplant/tropical, +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "uOE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -43131,7 +43138,7 @@ mBV xuc tdn apF -aWA +uMP akk rZH aMm From a9c259f105070d442808e65d83635e74568ac07f Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:27:37 +0100 Subject: [PATCH 08/20] pilots dont answer to the PF anymore(outside of excursions with exploration of course) --- code/modules/jobs/job_types/station/civillian/pilot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/station/civillian/pilot.dm b/code/modules/jobs/job_types/station/civillian/pilot.dm index f5ce3fdefcf0..c49ac626311f 100644 --- a/code/modules/jobs/job_types/station/civillian/pilot.dm +++ b/code/modules/jobs/job_types/station/civillian/pilot.dm @@ -7,7 +7,7 @@ department_flag = CIVILIAN total_positions = 5 spawn_positions = 5 - supervisors = "the Pathfinder and the Head of Personnel" + supervisors = "the Head of Personnel" idtype = /obj/item/card/id/explorer/pilot selection_color = "#515151" minimal_player_age = 3 From dd98c96f6aa702dc075086b035eeb18c222f19fd Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:53:05 +0100 Subject: [PATCH 09/20] return explo prep to the prior glory --- code/game/area/station/exporation.dm | 5 + maps/rift/levels/rift-06-surface3.dmm | 887 +++++++++++++++----------- 2 files changed, 531 insertions(+), 361 deletions(-) diff --git a/code/game/area/station/exporation.dm b/code/game/area/station/exporation.dm index 93e68888e70b..399c18f2a2bb 100644 --- a/code/game/area/station/exporation.dm +++ b/code/game/area/station/exporation.dm @@ -19,6 +19,11 @@ icon_state = "locker" nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES +/area/exploration/medic_prep + name = "\improper Field Medic Prep Room" + icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + /area/exploration/pilot_prep name = "\improper Pilot Prep Room" icon_state = "locker" diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index d6762de94d2d..f16d7e3a674f 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -112,7 +112,19 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/hop) "aas" = ( -/obj/machinery/suit_cycler/exploration, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aat" = ( @@ -174,6 +186,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "aaC" = ( @@ -324,9 +339,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-10" - }, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "abk" = ( @@ -614,6 +626,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "acc" = ( @@ -1208,10 +1223,10 @@ /area/ai_upload_foyer) "adV" = ( /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 @@ -1220,7 +1235,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "adW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -1371,7 +1386,7 @@ /area/bridge/bridge_hallway) "aew" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-8" }, /turf/simulated/floor/tiled/techmaint, @@ -1623,8 +1638,11 @@ dir = 8 }, /obj/landmark/spawnpoint/job/field_medic, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "afu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -1939,14 +1957,10 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "agr" = ( -/obj/structure/table/bench/steel, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/table/steel, +/obj/item/multitool, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "agt" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -2524,6 +2538,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "aia" = ( @@ -2885,22 +2902,22 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "aiT" = ( -/obj/structure/table/bench/steel, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 1 - }, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aiU" = ( +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "aiW" = ( @@ -2978,6 +2995,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ajd" = ( @@ -3241,7 +3261,10 @@ req_access = list(); req_one_access = list(19,43,67) }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "ajU" = ( /obj/effect/floor_decal/borderfloor{ @@ -3339,7 +3362,14 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/locker/laundry_arrival) "akc" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/machinery/power/smes/buildable/power_shuttle{ + name = "Courser Charging Port"; + RCon_tag = "Courser Charging Port" + }, +/obj/structure/catwalk, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "akd" = ( @@ -3493,7 +3523,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "akv" = ( /obj/structure/closet/secure_closet/personal{ name = "Official Personal Storage" @@ -3698,6 +3728,9 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "alb" = ( @@ -3784,7 +3817,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, @@ -4710,10 +4743,12 @@ /area/crew_quarters/bar) "anQ" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/machinery/power/terminal, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) "anR" = ( /obj/machinery/door/airlock/voidcraft{ name = "cockpit" @@ -4773,7 +4808,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, @@ -5112,7 +5147,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, @@ -5348,7 +5383,7 @@ id_tag = "expshuttle_docker_pump_out_external" }, /obj/map_helper/airlock/atmos/pump_out_internal, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, @@ -5373,8 +5408,8 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "apF" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) @@ -5391,6 +5426,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "apI" = ( @@ -5535,8 +5573,9 @@ /obj/structure/table/standard, /obj/item/defib_kit/loaded, /obj/item/storage/firstaid/surgery, -/turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/medic_prep) "aqh" = ( /obj/effect/floor_decal/borderfloorblack/cee{ dir = 8 @@ -6012,7 +6051,7 @@ dir = 6 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "arp" = ( /obj/machinery/appliance/mixer/cereal{ anchored = 0; @@ -6137,11 +6176,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/beige/border, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "arD" = ( @@ -6263,6 +6302,12 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "arZ" = ( @@ -6468,8 +6513,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "asz" = ( /obj/machinery/air_alarm{ dir = 4; @@ -6613,13 +6662,12 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "asV" = ( -/obj/structure/closet/hydrant{ - dir = 4; - pixel_x = 32 +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 }, -/obj/machinery/suit_storage_unit/exploration, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/turf/simulated/floor/plating, +/area/maintenance/station/exploration) "atb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -6697,7 +6745,7 @@ /turf/simulated/floor/tiled/monotile, /area/bridge/bunker) "atl" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, @@ -7150,10 +7198,10 @@ id_tag = "courser_docker"; pixel_x = 25 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "auw" = ( @@ -7434,8 +7482,10 @@ /obj/item/suit_cooling_unit, /obj/item/tank/oxygen, /obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled/steel, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "avp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8316,9 +8366,12 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "axe" = ( -/obj/machinery/suit_storage_unit/exploration, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/obj/machinery/light, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/courser_dock) "axf" = ( /obj/machinery/computer/power_monitor, /obj/effect/floor_decal/corner/lightorange{ @@ -8699,6 +8752,9 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ayk" = ( @@ -8778,9 +8834,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "ayu" = ( @@ -8987,7 +9040,7 @@ }, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/steel, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aza" = ( /turf/simulated/wall/durasteel, /area/ai) @@ -9463,6 +9516,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aAD" = ( @@ -9510,8 +9566,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable/pink{ + icon_state = "1-8" }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) @@ -9865,6 +9921,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "aBS" = ( @@ -10356,8 +10415,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, /obj/machinery/suit_cycler/medical, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aDp" = ( /obj/machinery/atmospherics/portables_connector/fuel{ dir = 8 @@ -10400,7 +10460,7 @@ pixel_y = 26 }, /obj/map_helper/airlock/sensor/int_sensor, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled/techmaint, @@ -10901,7 +10961,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, @@ -12156,7 +12216,7 @@ dir = 10 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aIA" = ( /obj/structure/catwalk, /turf/simulated/floor/plating/lythios43c, @@ -12568,6 +12628,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aJx" = ( @@ -12813,9 +12876,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aKd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/air_alarm/west_mount, /obj/structure/bed/chair/bay/comfy/black, /turf/simulated/floor/wood, @@ -13091,10 +13151,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aKP" = ( @@ -13283,17 +13343,11 @@ /turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfaceeva/aa/cliff_south) "aLw" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/table/bench/steel, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/exploration/explorer_prep) "aLz" = ( /obj/structure/table/steel_reinforced, @@ -13495,20 +13549,11 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "aMj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/turf/simulated/floor/tiled/monotile, +/area/exploration) "aMk" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) @@ -13557,15 +13602,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aMr" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/power/smes/buildable/power_shuttle{ + name = "Exploration Shuttle Charging Port" + }, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/exploration/explorer_prep) "aMs" = ( /obj/effect/floor_decal/corner/beige/full{ @@ -13868,6 +13919,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "aNq" = ( @@ -14087,12 +14141,11 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "aNW" = ( -/obj/item/tool/wrench, -/obj/structure/table/steel, -/obj/item/tool/screwdriver, -/obj/item/duct_tape_roll, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/courser_dock) "aNX" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -14252,8 +14305,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/cable{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/monotile, /area/exploration) @@ -14307,7 +14360,7 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aOB" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -14610,7 +14663,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, @@ -14702,11 +14755,15 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aPF" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/area/exploration/explorer_prep) "aPJ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -14842,7 +14899,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, @@ -15014,11 +15071,32 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside3) "aQr" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/machinery/suit_storage_unit/exploration, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aQs" = ( @@ -15131,7 +15209,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, @@ -15499,7 +15577,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, @@ -15577,13 +15655,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "aSf" = ( @@ -15715,7 +15793,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aSq" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock19"; @@ -16216,7 +16294,7 @@ }, /obj/landmark/spawnpoint/job/field_medic, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aTR" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -16489,7 +16567,7 @@ req_one_access = list(5,44) }, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aUA" = ( /obj/structure/mirror{ dir = 4; @@ -16643,7 +16721,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aUU" = ( /obj/machinery/air_alarm{ pixel_y = 24 @@ -16759,7 +16837,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, @@ -17263,12 +17341,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, -/obj/machinery/suit_storage_unit/search_and_rescue{ - helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/medical/alt_plated; - suit_stored_TYPE = /obj/item/clothing/suit/space/void/medical/alt_plated - }, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aWR" = ( /obj/effect/shuttle_landmark/rift/deck3/specops, /turf/simulated/floor/reinforced/lythios43c, @@ -17309,7 +17384,7 @@ /obj/item/storage/backpack/parachute, /obj/item/binoculars, /turf/simulated/floor/tiled, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "aWW" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 4 @@ -17610,6 +17685,9 @@ /obj/machinery/camera/network/exploration{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aXR" = ( @@ -17660,6 +17738,9 @@ /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "aXW" = ( @@ -18419,6 +18500,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "boK" = ( @@ -18445,9 +18529,6 @@ /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway) "bqH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/holopad/ship, /turf/simulated/floor/wood, /area/exploration/pilot_prep) @@ -18577,24 +18658,9 @@ /area/hallway/primary/surfacethree) "bON" = ( /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacethree) +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/medic_prep) "bPD" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -18728,6 +18794,30 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"ciC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/exploration/excursion_dock) +"cjr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "cnu" = ( /turf/simulated/wall/prepainted, /area/maintenance/bar/lower) @@ -18769,7 +18859,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -18784,7 +18874,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, @@ -18958,6 +19048,15 @@ }, /turf/simulated/floor/carpet/blue, /area/exploration/pilot_prep) +"cXu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/medic_prep) "cYb" = ( /obj/machinery/door/airlock/multi_tile/glass/civilian{ dir = 4 @@ -19061,10 +19160,10 @@ }, /obj/structure/railing, /obj/structure/handrail, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "drn" = ( @@ -19359,6 +19458,14 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"ebe" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/terminal, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) "ebz" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/air_alarm/east_mount, @@ -19383,6 +19490,9 @@ /area/hydroponics) "egu" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "ehI" = ( @@ -19423,10 +19533,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "eod" = ( @@ -19534,10 +19644,10 @@ name = "\improper LIVE ORDINANCE"; pixel_x = 32 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "ezH" = ( @@ -19787,9 +19897,6 @@ /area/maintenance/bar) "eOV" = ( /obj/machinery/fire_alarm/east_mount, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "ePV" = ( @@ -19899,10 +20006,10 @@ dir = 1 }, /obj/structure/handrail, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "fea" = ( @@ -20151,15 +20258,23 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"fMp" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) "fMP" = ( /turf/simulated/wall/r_wall/prepainted, /area/teleporter/departing) "fOb" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/structure/cable/pink{ + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/station/exploration) +/area/exploration/explorer_prep) "fOF" = ( /obj/structure/table/wooden_reinforced, /obj/effect/floor_decal/spline/plain{ @@ -20195,10 +20310,8 @@ /area/rift/trade_shop/landing_pad) "fRT" = ( /obj/machinery/door/airlock/maintenance/engi{ - req_one_access = list(10, 67) - }, -/obj/structure/cable{ - icon_state = "1-2" + req_one_access = null; + req_access = list(12, 67) }, /turf/simulated/floor/plating, /area/exploration/pilot_prep) @@ -20252,6 +20365,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "fVI" = ( @@ -20303,6 +20419,9 @@ dir = 4; pixel_x = -30 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ghf" = ( @@ -20403,17 +20522,14 @@ /area/crew_quarters/locker/laundry_arrival) "gsH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/catwalk, /obj/item/radio/beacon/anchored, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "gtg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wood, /area/exploration/pilot_prep) @@ -20438,9 +20554,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "guk" = ( @@ -21158,6 +21271,9 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/exploration) "ivw" = ( @@ -21284,8 +21400,11 @@ name = "Medic Prep"; req_one_access = list(44,19,5) }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/area/exploration/medic_prep) "iKl" = ( /obj/structure/foamedmetal, /obj/structure/grille, @@ -21453,9 +21572,6 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "jlx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/bed/chair/bay/comfy/black{ dir = 1 }, @@ -21502,7 +21618,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, @@ -21630,6 +21746,9 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "jGl" = ( @@ -21938,7 +22057,7 @@ dir = 8 }, /obj/structure/railing, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "0-2" }, /turf/simulated/floor/plating, @@ -22104,6 +22223,9 @@ /obj/machinery/holoposter{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "kRX" = ( @@ -22154,12 +22276,10 @@ name = "Exploration Airlock"; req_one_access = list(19,43,67) }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) "lbu" = ( @@ -22180,10 +22300,10 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "lhu" = ( @@ -22318,9 +22438,6 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) "lAT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/table/woodentable, /obj/machinery/light{ dir = 8 @@ -22348,6 +22465,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "lJp" = ( @@ -22459,12 +22579,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/fuel, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/atmospherics/component/unary/heater{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "lSn" = ( @@ -22504,7 +22624,9 @@ department = "Exploration" }, /obj/machinery/power/apc/east_mount, -/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "lWu" = ( @@ -22657,10 +22779,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "mnJ" = ( @@ -22696,6 +22818,9 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) +"mrz" = ( +/turf/simulated/wall/prepainted/exploration, +/area/exploration/medic_prep) "mrO" = ( /obj/machinery/holoposter{ pixel_x = 32 @@ -23063,6 +23188,9 @@ dir = 4; req_one_access = list(19,43,67) }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "nin" = ( @@ -23087,8 +23215,9 @@ /area/maintenance/bar) "njG" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "nlb" = ( @@ -23104,8 +23233,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "nms" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/wood, /area/exploration/pilot_prep) @@ -23260,9 +23389,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "nOb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/civilian/alt{ req_one_access = list(67) }, @@ -23362,6 +23488,9 @@ /area/rift/surfaceeva/airlock/arrivals) "okY" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ooQ" = ( @@ -23375,6 +23504,9 @@ /obj/effect/floor_decal/corner/beige/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/beige/bordercorner2, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "oqe" = ( @@ -23398,6 +23530,9 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"oqA" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/medic_prep) "orx" = ( /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, @@ -23468,16 +23603,13 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "oAw" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -23523,7 +23655,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, @@ -23706,6 +23838,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) +"pgY" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/medic_prep) "phy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, @@ -23722,6 +23860,9 @@ /obj/effect/floor_decal/corner/beige/bordercorner{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "pjG" = ( @@ -23740,6 +23881,11 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"pkZ" = ( +/obj/machinery/air_alarm/west_mount, +/obj/structure/closet/radiation, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "ply" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23752,6 +23898,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/courser_dock) "pnb" = ( @@ -23767,6 +23916,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "pov" = ( @@ -24490,7 +24642,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "riL" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -24928,6 +25080,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/courser_dock) "sMy" = ( @@ -25019,7 +25174,7 @@ /area/exploration/excursion_dock) "tdn" = ( /obj/structure/cable/green{ - icon_state = "1-6" + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) @@ -25053,8 +25208,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/cable/pink{ + icon_state = "2-4" }, /turf/simulated/floor/tiled/monotile, /area/exploration/excursion_dock) @@ -25108,6 +25263,9 @@ /obj/machinery/door/airlock/multi_tile/glass/exploration{ req_one_access = list(19,43,67) }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "trc" = ( @@ -25221,6 +25379,11 @@ /obj/structure/railing, /turf/simulated/open, /area/maintenance/commandmaint) +"tHH" = ( +/obj/structure/table/steel, +/obj/item/storage/toolbox/electrical, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "tHQ" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -25273,6 +25436,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) +"tIR" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "tKy" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -25324,7 +25491,7 @@ pixel_x = 24; pixel_y = -8 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -25461,10 +25628,10 @@ /area/shuttle/emt/general) "use" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/turf/simulated/floor/tiled/monotile, +/area/exploration) "uxa" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -25485,21 +25652,13 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "uxD" = ( -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/explorer_prep) +/obj/structure/stasis_cage, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/exploration/courser_dock) "uyj" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, @@ -25516,24 +25675,8 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) "uAA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/item/duct_tape_roll, -/obj/structure/table/steel, -/obj/item/storage/single_use/med_pouch/burn, -/obj/item/storage/single_use/med_pouch/oxyloss, -/obj/item/storage/single_use/med_pouch/toxin, -/obj/item/storage/single_use/med_pouch/radiation, -/obj/item/storage/single_use/med_pouch/trauma, -/obj/item/storage/single_use/med_pouch/trauma, -/obj/item/storage/single_use/med_pouch/radiation, -/obj/item/gun/ballistic/shotgun/flare/explo, -/obj/item/storage/box/flashshells, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "uCG" = ( /obj/machinery/door/blast/shutters{ @@ -25583,9 +25726,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "uMf" = ( @@ -25605,7 +25745,7 @@ /turf/simulated/floor/wood, /area/exploration/pilot_Office) "uOE" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -25710,6 +25850,9 @@ /obj/machinery/door/airlock/civilian/alt{ req_one_access = list(67) }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "uVz" = ( @@ -25756,6 +25899,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"vdt" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) "vdu" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25915,6 +26068,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "vtz" = ( @@ -26092,7 +26248,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, @@ -26204,11 +26360,15 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "vUc" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/machinery/suit_storage_unit/exploration, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "vVw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -26356,6 +26516,11 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/checkpoint2) +"wkX" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint/violet, +/turf/simulated/floor/plating, +/area/exploration/medic_prep) "wlu" = ( /obj/structure/sign/department/commander, /turf/simulated/wall/r_wall/prepainted/command, @@ -26405,7 +26570,7 @@ req_one_access = list(19,43,67) }, /obj/map_helper/airlock/door/ext_door, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_grid, @@ -26690,7 +26855,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xmB" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -26780,10 +26945,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/catwalk, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) "xvO" = ( @@ -27059,7 +27224,7 @@ master_tag = "courser_docker"; pixel_y = -22 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -42550,12 +42715,12 @@ tCt jpv jpv jpv -bON +vMY nOb -anQ +aWA aKd lAT -vUc +aWA gPk cIq cIq @@ -42943,7 +43108,7 @@ lWV aWA dVA apI -apF +aWA uEE akk aww @@ -43526,11 +43691,11 @@ vOW cye abi nms -use +qcL gtg oxz -aPF -aPF +aMm +aMm fRT njG wUC @@ -43719,14 +43884,14 @@ aqW awu abF bqH -qcL +nms qcL bis aFg ebz aFg aqW -aUi +cjr aCQ ung ung @@ -44511,7 +44676,7 @@ ahh hCM ali awE -aYw +ciC aYw wIv gtI @@ -44532,7 +44697,7 @@ aHZ aHZ aHZ aHp -aYe +aNW cvI afq afq @@ -44699,13 +44864,13 @@ aLC ajU aLC aSk -agW +use ako hXj hXj hXj hXj -hXj +fOb hXj aDp aWi @@ -44726,7 +44891,7 @@ aNi aNi aXO aHp -aoO +axe cvI afq afq @@ -44897,9 +45062,9 @@ pnT jNZ hXj uAA -aTd -aFY -aul +pkZ +ebe +aMr hXj mHn mHn @@ -44920,7 +45085,7 @@ aOZ aWq aYW aHp -aYe +aNW cvI afq afq @@ -45089,11 +45254,11 @@ lZM ayt aOp arC -jpO +ajT aLw -ark -arc -aIj +aLw +vdt +tIR hXj aHv aHv @@ -45114,7 +45279,7 @@ aUa aWu aZr aHp -aYe +aNW cvI afq afq @@ -45283,14 +45448,14 @@ lZM aiZ aeh aiY -dIa -agr -aAq -arc -aJv hXj -aHv -aHv +agr +tHH +anQ +akc +fMp +uxD +uxD apG fUe cvI @@ -45308,7 +45473,7 @@ aUP aWB aOZ aHp -aoO +axe cvI afq afq @@ -45478,10 +45643,10 @@ awO agW xbb hXj -aiT -aAq -arc -aJv +hXj +hXj +hXj +hXj hXj aZW aZW @@ -45502,7 +45667,7 @@ aOZ aWD aHB aHB -aYe +aNW cvI afq afq @@ -45671,11 +45836,11 @@ sON awO agW arf -hRh -aAq -aAq -awi -alw +hXj +vUc +aTd +aFY +aul hXj aZW aZW @@ -45696,7 +45861,7 @@ aDL aWM aZI arA -aYe +aNW cvI afq afq @@ -45863,13 +46028,13 @@ aHJ aiS lZM ajc -agW -aBQ -hXj -auT aMj -aJm -ahq +aBQ +jpO +aiT +ark +arc +aIj hXj aCt aFf @@ -46059,11 +46224,11 @@ lZM awO agW rMs -hXj -hXj -hXj -hXj -hXj +dIa +aPF +aAq +arc +aJv hXj acI alF @@ -46253,11 +46418,11 @@ mpX awO agW aXG -akc +hXj aas -aMr -uxD -aNW +aAq +arc +aJv hXj aZk axm @@ -46447,11 +46612,11 @@ mpX awO agW arf -ajT -aAq -aAq +hRh aAq aAq +awi +alw hXj aSG aJo @@ -46641,11 +46806,11 @@ igJ awO agW aAH -akc -axe +hXj +auT aQr -asV -axe +aJm +ahq hXj jew axm @@ -47029,13 +47194,13 @@ ydU apl aLf aXG -dIa +wkX asy aqg aSp aWV -hXj -hXj +mrz +mrz wrC fhj fhj @@ -47224,12 +47389,12 @@ adL aca aaB iKg -aAq +pgY afr aku aIz aOy -hXj +mrz tiv aYp pxw @@ -47417,13 +47582,13 @@ mpX anC aEy ayz -dIa +wkX adV -aUT -aTQ -aro +oqA +oqA +bON ayY -hXj +mrz lNq agZ pxw @@ -47611,13 +47776,13 @@ dDb aCJ ajH aNm -dIa -aDo -aUz -aWQ -aWQ +wkX +cXu +aUT +aTQ +aro avn -hXj +mrz aif aKt pxw @@ -47805,13 +47970,13 @@ ieJ aOF ajI aTF -hXj -hXj -hXj -hXj -hXj -hXj -fhj +mrz +aDo +aUz +aWQ +aWQ +mrz +mrz aif aKt pxw @@ -47999,11 +48164,11 @@ ieJ veT ajL veT -veT -aKt -aKt -fOb -aKt +mrz +mrz +mrz +mrz +mrz fam aKt aif @@ -48196,7 +48361,7 @@ pxw aKt aif aif -aif +asV aif aif aif From 54c0024c3fe3434d791810cdeee8d16b8b5c3ff9 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:42:09 +0100 Subject: [PATCH 10/20] missed a wire:) --- maps/rift/levels/rift-06-surface3.dmm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index f16d7e3a674f..a8cd05feae13 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -3008,7 +3008,7 @@ /area/crew_quarters/heads/hop) "aje" = ( /obj/machinery/door/airlock/engineering{ - name = "Science Substation"; + name = "Exploration Substation"; req_one_access = list(11,24,47) }, /obj/structure/cable/green{ @@ -6865,7 +6865,6 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, -/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "atD" = ( @@ -9275,7 +9274,6 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, -/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "azG" = ( @@ -10935,13 +10933,13 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "aEW" = ( -/obj/machinery/door/airlock/engineering{ - name = "Science Substation"; - req_one_access = list(11,24,47) - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock/engineering{ + name = "Exploration Substation"; + req_one_access = list(11,24,47) + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "aEY" = ( @@ -14865,7 +14863,6 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, -/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "aPV" = ( @@ -15430,7 +15427,6 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, -/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/plating, /area/exploration/excursion_dock) "aRx" = ( @@ -19257,6 +19253,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "dDb" = ( @@ -23330,8 +23329,8 @@ /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) "nFC" = ( -/obj/machinery/power/breakerbox{ - RCon_tag = "Exploration and Research Shuttles Substation Bypass" +/obj/machinery/power/breakerbox/activated{ + RCon_tag = "Exploration Substation Bypass" }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) From f61207522d26f5e54200debc36f23c0334c65723 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:49:07 +0100 Subject: [PATCH 11/20] paint stripes for the windows --- maps/rift/levels/rift-06-surface3.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index a8cd05feae13..7f1ea1e45b39 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -20262,6 +20262,7 @@ /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/effect/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "fMP" = ( @@ -20272,6 +20273,7 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/effect/paint/violet, /turf/simulated/floor/plating, /area/exploration/explorer_prep) "fOF" = ( From dec43411640d5cda39c67ff9674bbc3c130f45da Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:38:36 +0100 Subject: [PATCH 12/20] another wire I missed --- maps/rift/levels/rift-06-surface3.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 7f1ea1e45b39..60ea25f8a52b 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -5574,6 +5574,9 @@ /obj/item/defib_kit/loaded, /obj/item/storage/firstaid/surgery, /obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/medic_prep) "aqh" = ( From 1922ee1c51e85459564dcd4dd76fef1efbab10b1 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:48:41 +0100 Subject: [PATCH 13/20] Right PTO type for pilots --- code/modules/jobs/job_types/station/civillian/pilot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/station/civillian/pilot.dm b/code/modules/jobs/job_types/station/civillian/pilot.dm index c49ac626311f..0e414c83bf02 100644 --- a/code/modules/jobs/job_types/station/civillian/pilot.dm +++ b/code/modules/jobs/job_types/station/civillian/pilot.dm @@ -11,7 +11,7 @@ idtype = /obj/item/card/id/explorer/pilot selection_color = "#515151" minimal_player_age = 3 - pto_type = PTO_EXPLORATION + pto_type = PTO_CIVILIAN minimal_access = list( ACCESS_GENERAL_PILOT, ACCESS_ENGINEERING_AIRLOCK, From 303142f53d05bf42574cc1eb67ae0fc4f26e21b2 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:52:12 +0100 Subject: [PATCH 14/20] Floor decals --- maps/rift/levels/rift-06-surface3.dmm | 119 ++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 60ea25f8a52b..27f7ed87e51b 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -2243,6 +2243,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lime/bordercorner2, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "ahk" = ( @@ -5411,6 +5415,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "apG" = ( @@ -7589,6 +7596,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "avy" = ( @@ -12879,6 +12888,9 @@ "aKd" = ( /obj/machinery/air_alarm/west_mount, /obj/structure/bed/chair/bay/comfy/black, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "aKe" = ( @@ -14139,6 +14151,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "aNW" = ( @@ -18653,6 +18666,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bON" = ( @@ -19095,6 +19110,7 @@ /obj/item/modular_computer/console/preset/civilian{ dir = 1 }, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "dcy" = ( @@ -20680,6 +20696,9 @@ /obj/machinery/computer/ship/sensors/planet{ dir = 1 }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "gTy" = ( @@ -20879,6 +20898,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "hAM" = ( @@ -21516,6 +21537,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jbk" = ( @@ -21823,6 +21846,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"jHN" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "jIg" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -22015,6 +22044,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jZP" = ( @@ -22199,6 +22236,25 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/teleporter/departing) +"kKk" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacethree) "kKC" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/beehive, @@ -22448,6 +22504,9 @@ }, /obj/item/paper_bin, /obj/item/pen, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "lDX" = ( @@ -22927,6 +22986,9 @@ icon_state = "1-2" }, /mob/living/simple_mob/animal/passive/snake/noodle, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "mCR" = ( @@ -24788,6 +24850,12 @@ /obj/landmark/spawnpoint/job/blueshield, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"rKd" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "rKC" = ( /obj/structure/bed/chair/backed_grey{ dir = 8 @@ -24950,6 +25018,29 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) +"sja" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/surfacethree) "slu" = ( /obj/structure/railing{ dir = 4 @@ -25180,6 +25271,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "tfz" = ( @@ -25696,6 +25790,7 @@ /area/crew_quarters/locker/laundry_arrival) "uEE" = ( /obj/structure/filingcabinet/chestdrawer, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "uGZ" = ( @@ -25746,6 +25841,9 @@ "uMP" = ( /obj/structure/flora/pottedplant/tropical, /obj/structure/table/woodentable, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "uOE" = ( @@ -26891,6 +26989,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) "xug" = ( @@ -27116,6 +27217,12 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/ai) +"xUu" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "xVh" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -42721,10 +42828,10 @@ jpv jpv vMY nOb -aWA +rKd aKd lAT -aWA +jHN gPk cIq cIq @@ -42915,7 +43022,7 @@ jpv jpv ahj akk -aWA +xUu dVA fVL jlx @@ -43107,9 +43214,9 @@ suT jpv jpv jpv -vMY +kKk lWV -aWA +xUu dVA apI aWA @@ -44077,7 +44184,7 @@ tHQ aaQ aaQ aaQ -fVI +sja aqW cWu lJp From 4aef0573c9de9876082e8d32f76c32ae7311954c Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:10:23 +0100 Subject: [PATCH 15/20] Security cameras for the pilot office --- maps/rift/levels/rift-06-surface3.dmm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 27f7ed87e51b..6fe2197c16d6 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -14152,6 +14152,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "aNW" = ( @@ -24030,6 +24033,9 @@ pixel_y = -11 }, /obj/machinery/recharger, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, /turf/simulated/floor/wood, /area/exploration/pilot_prep) "pul" = ( @@ -26471,6 +26477,13 @@ /obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) +"vUJ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "vVw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -43022,7 +43035,7 @@ jpv jpv ahj akk -xUu +vUJ dVA fVL jlx From 0252a5402853149b23f9ec9ac281745c6fcbd621 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:19:11 +0100 Subject: [PATCH 16/20] new office location --- maps/rift/levels/rift-06-surface3.dmm | 1360 ++++++++++++------------- 1 file changed, 668 insertions(+), 692 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 6fe2197c16d6..ac14ecc5ec0c 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -336,11 +336,20 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "abi" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway2) "abk" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 4 @@ -474,11 +483,9 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "abF" = ( -/obj/structure/table/woodentable, -/obj/random/carp_plushie, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/carpet/blue, -/area/exploration/pilot_prep) +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "abG" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -942,9 +949,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "adj" = ( @@ -982,9 +986,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "adp" = ( @@ -1363,10 +1364,10 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ - dir = 9 + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -1465,10 +1466,12 @@ /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) "aeH" = ( -/obj/structure/table/steel, -/obj/random/maintenance/research, +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/area/maintenance/bar/lower) "aeK" = ( /obj/structure/curtain/open/bed{ name = "brown curtain"; @@ -1708,9 +1711,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "afA" = ( @@ -2225,30 +2225,17 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "ahj" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -27 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lime/bordercorner2, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacethree) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "ahk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -3246,13 +3233,9 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "ajR" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/item/stool/padded, -/obj/landmark/spawnpoint/job/pilot, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/area/exploration/pilot_Office) "ajS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3280,6 +3263,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "ajV" = ( @@ -4673,9 +4659,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "anH" = ( @@ -5412,13 +5395,8 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "apF" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/wood, +/obj/structure/flora/pottedplant/tropical, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "apG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5439,10 +5417,12 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "apI" = ( -/obj/structure/table/woodentable, -/obj/random/carp_plushie, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "apK" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -5466,9 +5446,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "apO" = ( @@ -6049,7 +6026,7 @@ /obj/item/storage/single_use/mre/menu9, /obj/item/storage/single_use/mre/menu10, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "0-4" }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -6127,9 +6104,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "arA" = ( @@ -6312,12 +6286,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "arZ" = ( @@ -6764,7 +6732,21 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/wall/prepainted/exploration, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, /area/exploration) "atn" = ( /obj/overmap/entity/visitable/sector/lythios43c, @@ -6895,7 +6877,11 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside3) "atK" = ( -/turf/simulated/floor/outdoors/snow/lythios43c, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, /area/maintenance/commandmaint) "atL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7590,14 +7576,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "avy" = ( @@ -7707,9 +7693,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "avH" = ( @@ -8024,9 +8007,17 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "awu" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/carpet/blue, -/area/exploration/pilot_prep) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "aww" = ( /obj/machinery/suit_storage_unit/pilot, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -8763,9 +8754,6 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "ayk" = ( @@ -9526,9 +9514,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aAD" = ( @@ -10849,9 +10834,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aEM" = ( @@ -11302,11 +11284,17 @@ /turf/simulated/floor/lythios43c/indoors, /area/maintenance/commandmaint) "aFX" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/camera/network/civilian{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/primary/surfacethree) +/obj/machinery/button/remote/blast_door{ + id = "pilot_prep"; + name = "Window Shutter Controll"; + dir = 4; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "aFY" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -12366,8 +12354,18 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIS" = ( -/turf/simulated/wall/prepainted/exploration, -/area/exploration/pilot_prep) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/exploration) "aIT" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 8 @@ -12635,11 +12633,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/exploration) @@ -12781,9 +12776,6 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aJR" = ( @@ -12886,13 +12878,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aKd" = ( -/obj/machinery/air_alarm/west_mount, -/obj/structure/bed/chair/bay/comfy/black, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "aKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -12936,12 +12926,12 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aKn" = ( @@ -13929,11 +13919,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aNp" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -14140,23 +14127,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aNV" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/obj/machinery/floodlight, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "aNW" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -15472,9 +15445,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aRz" = ( @@ -15740,6 +15710,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/exploration) "aSl" = ( @@ -16640,9 +16613,6 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "aUF" = ( @@ -17234,7 +17204,10 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/shuttle) "aWA" = ( -/turf/simulated/floor/wood, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "aWB" = ( /obj/machinery/power/apc/south_mount, @@ -17697,12 +17670,6 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/camera/network/exploration{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monotile, /area/exploration) "aXR" = ( @@ -18468,9 +18435,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bfN" = ( @@ -18478,10 +18442,8 @@ /turf/simulated/floor/plating, /area/shuttle/emt/cockpit) "bis" = ( -/obj/structure/window/basic{ - pixel_y = -7 - }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "bjs" = ( /turf/simulated/wall/prepainted/civilian, @@ -18515,9 +18477,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "boK" = ( @@ -18544,9 +18503,9 @@ /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway) "bqH" = ( -/obj/machinery/holopad/ship, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "brl" = ( /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) @@ -18575,16 +18534,16 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "bwq" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "byz" = ( /obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/area/maintenance/bar/lower) "bDP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -18914,12 +18873,36 @@ /turf/simulated/wall/prepainted, /area/bridge/bunker) "cye" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/air_alarm/west_mount, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/carpet/blue, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/tiled, /area/exploration/pilot_prep) "czm" = ( /obj/structure/disposalpipe/trunk{ @@ -19060,11 +19043,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "cWu" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/turf/simulated/floor/carpet/blue, -/area/exploration/pilot_prep) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/bar/lower) "cXu" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -19110,11 +19090,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "dan" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + id = "Pilot_office_Shutter"; + name = "Pilot Office Window Shutters" }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/wood, +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, /area/exploration/pilot_Office) "dcy" = ( /obj/structure/table/wooden_reinforced, @@ -19275,9 +19257,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "dDb" = ( @@ -19414,9 +19393,18 @@ /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) "dVA" = ( -/obj/structure/bed/chair/bay/comfy/black, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "dWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19488,8 +19476,8 @@ /turf/simulated/floor/plating, /area/exploration/explorer_prep) "ebz" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/machinery/air_alarm/east_mount, +/obj/structure/table/reinforced, +/obj/item/toy/plushie/carp/void, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "edo" = ( @@ -19504,15 +19492,12 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/hydroponics) "egu" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/exploration) @@ -19903,11 +19888,12 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "eNg" = ( -/obj/random/tech_supply, -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/holopad, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "eOH" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -19917,9 +19903,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "eOV" = ( -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "ePV" = ( /obj/landmark/away, /obj/machinery/holopad, @@ -20004,20 +19990,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fam" = ( -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/maintenance/station/exploration) +/obj/machinery/computer/ship/sensors/planet, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "fbX" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/reinforced, @@ -20140,6 +20115,13 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) +"frZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/air_alarm/north_mount, +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "fsc" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ @@ -20332,12 +20314,13 @@ /turf/simulated/wall/r_wall/prepainted, /area/rift/trade_shop/landing_pad) "fRT" = ( -/obj/machinery/door/airlock/maintenance/engi{ - req_one_access = null; - req_access = list(12, 67) +/obj/machinery/door/airlock/maintenance/int, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/exploration/pilot_prep) +/area/maintenance/bar/lower) "fSv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20415,10 +20398,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( -/obj/structure/table/woodentable, -/obj/item/storage/box/snakesnackbox, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/table/rack/steel, +/obj/random/maintenance/clean, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20438,13 +20422,6 @@ /area/shuttle/excursion/general) "gcc" = ( /obj/structure/disposalpipe/segment, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "ghf" = ( @@ -20553,9 +20530,9 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "gtg" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "gtI" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20696,14 +20673,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "gPk" = ( -/obj/machinery/computer/ship/sensors/planet{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/random/maintenance/clean, +/obj/structure/table/steel, +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "gTy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20760,6 +20734,10 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"hdv" = ( +/obj/structure/catwalk, +/turf/simulated/wall/prepainted/civilian, +/area/exploration/pilot_Office) "hfE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20782,6 +20760,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar) +"hhy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "hhF" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -20957,11 +20948,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass{ +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) + }, +/obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "hDa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 @@ -20981,17 +20975,21 @@ /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) "hEX" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "hFl" = ( -/obj/machinery/camera/network/engineering{ +/obj/machinery/camera/network/civilian{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/button/remote/blast_door{ + id = "Pilot_office_Shutter"; + name = "Window Shutter Controll"; + pixel_x = -24; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "hGl" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -21132,19 +21130,11 @@ /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) "hYK" = ( -/obj/machinery/suit_cycler/pilot, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "hZy" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 1 @@ -21241,15 +21231,10 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "iio" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 4; - name = "Maintenance Access" - }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/landmark/spawnpoint/job/pilot, +/obj/item/stool/padded, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "ikZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21478,9 +21463,13 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "iRO" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Exploration" + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) @@ -21602,12 +21591,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "jlx" = ( -/obj/structure/bed/chair/bay/comfy/black{ +/obj/structure/catwalk, +/obj/machinery/light/small{ dir = 1 }, -/obj/landmark/spawnpoint/job/pilot, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "jmj" = ( /obj/machinery/light/small{ dir = 4 @@ -21723,13 +21715,17 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jyZ" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/structure/cable/green{ +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/paint/palebottlegreen, -/turf/simulated/floor/plating, -/area/exploration/pilot_Office) +/turf/simulated/floor/tiled/steel, +/area/exploration) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21776,9 +21772,6 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "jGl" = ( @@ -21850,11 +21843,12 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jHN" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "jIg" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -22049,12 +22043,6 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/bordercorner2{ - dir = 9 - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jZP" = ( @@ -22280,15 +22268,6 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/holoposter{ - pixel_x = -32 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monotile, /area/exploration) "kRX" = ( @@ -22472,11 +22451,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "lud" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/bed/chair/bay/comfy/black, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "lxt" = ( /obj/effect/paint/black, /obj/effect/paint_stripe/violet, @@ -22501,17 +22479,9 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) "lAT" = ( -/obj/structure/table/woodentable, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "lDX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -22537,12 +22507,9 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "lJp" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/carpet/blue, -/area/exploration/pilot_prep) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/bar/lower) "lJM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22685,15 +22652,10 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "lSR" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration" - }, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "lWu" = ( /obj/machinery/disposal, @@ -22717,10 +22679,10 @@ /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) "lWV" = ( -/obj/spawner/window/low_wall/full/nogrille/firelocks, -/obj/effect/paint/palebottlegreen, +/obj/structure/table/rack/steel, +/obj/random/maintenance/medical, /turf/simulated/floor/plating, -/area/exploration/pilot_Office) +/area/maintenance/bar/lower) "lXf" = ( /obj/structure/railing{ dir = 8 @@ -22851,6 +22813,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"mmx" = ( +/obj/item/modular_computer/console/preset/civilian, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "mnJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -22983,16 +22949,10 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "mBV" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-2" }, -/mob/living/simple_mob/animal/passive/snake/noodle, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ @@ -23287,6 +23247,9 @@ icon_state = "2-4" }, /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "nlb" = ( @@ -23302,11 +23265,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "nms" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/structure/table/steel, +/obj/random/maintenance/research, +/obj/random/maintenance/security, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23458,11 +23423,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "nOb" = ( -/obj/machinery/door/airlock/civilian/alt{ - req_one_access = list(67) - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "nQb" = ( /obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/plating, @@ -23531,11 +23496,19 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "oeA" = ( -/obj/structure/table/woodentable, -/obj/machinery/chemical_dispenser/catering/bar_soft{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled, /area/exploration/pilot_prep) "ofq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -23556,12 +23529,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) "okY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + id = "pilot_prep"; + name = "Pilot Prep Window Shutters" }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, +/area/exploration/pilot_prep) "ooQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23672,11 +23647,12 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxz" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "oAw" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -23780,6 +23756,10 @@ /area/rift/surfaceeva/airlock/arrivals) "oNh" = ( /obj/machinery/light/small, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "oQY" = ( @@ -23929,9 +23909,6 @@ /obj/effect/floor_decal/corner/beige/bordercorner{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monotile, /area/exploration) "pjG" = ( @@ -24028,15 +24005,9 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "ptn" = ( -/obj/structure/table/woodentable, -/obj/item/storage/box/glasses/meta{ - pixel_y = -11 - }, +/obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "pul" = ( /obj/structure/grille, @@ -24100,7 +24071,10 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "pFg" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "pFn" = ( @@ -24126,6 +24100,16 @@ /obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) +"pKh" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "pKx" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -24197,6 +24181,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "pNP" = ( @@ -24259,8 +24246,18 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "qcL" = ( -/turf/simulated/floor/wood, -/area/exploration/pilot_prep) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/machinery/camera/network/exploration{ + dir = 4 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24402,25 +24399,11 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "qnC" = ( -/obj/structure/table/rack/shelf, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/obj/structure/table/rack/steel, +/obj/random/powercell, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "qnV" = ( /obj/structure/cable{ icon_state = "2-4" @@ -24638,15 +24621,9 @@ /turf/simulated/wall/prepainted, /area/bridge/bridge_hallway) "qWZ" = ( -/obj/random/tech_supply, -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/obj/item/stack/cable_coil/random, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "qYn" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24857,11 +24834,10 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) "rKd" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/random/maintenance/medical, +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "rKC" = ( /obj/structure/bed/chair/backed_grey{ dir = 8 @@ -25015,12 +24991,8 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "sei" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/light{ - light_range = 12 +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) @@ -25090,9 +25062,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "swD" = ( @@ -25274,14 +25243,9 @@ /turf/simulated/floor/plating, /area/exploration/excursion_dock) "tdn" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/machinery/holopad/ship, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "tfz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -25330,6 +25294,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "tnR" = ( @@ -25367,9 +25332,6 @@ /obj/machinery/door/airlock/multi_tile/glass/exploration{ req_one_access = list(19,43,67) }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "trc" = ( @@ -25441,9 +25403,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "tEl" = ( @@ -25521,6 +25480,13 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/bar) +"tIv" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/medical, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "tIJ" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -25664,11 +25630,14 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "ube" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "uhz" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -25732,7 +25701,7 @@ /area/shuttle/emt/general) "use" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, /turf/simulated/floor/tiled/monotile, /area/exploration) @@ -25795,10 +25764,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "uEE" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/machinery/air_alarm/south_mount, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "uGZ" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ dir = 1; @@ -25845,13 +25813,22 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) "uMP" = ( -/obj/structure/flora/pottedplant/tropical, -/obj/structure/table/woodentable, -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "uOE" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -25949,20 +25926,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "uTP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "5-9" - }, -/obj/machinery/door/airlock/civilian/alt{ - req_one_access = list(67) - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/door/airlock/maintenance/int, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "uVz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26176,9 +26145,6 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/simulated/floor/tiled/steel, /area/exploration) "vtz" = ( @@ -26293,9 +26259,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/junction/flipped{ dir = 8 }, @@ -26416,8 +26379,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bunker) "vMY" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26430,15 +26391,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "vOW" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/obj/landmark/spawnpoint/job/pilot, -/turf/simulated/floor/carpet/blue, -/area/exploration/pilot_prep) +/obj/random/tech_supply, +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26461,12 +26422,11 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "vRQ" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Landing Pads Substation" +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "vUc" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -26478,12 +26438,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "vUJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "vVw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -26808,6 +26765,12 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"wDH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "wEy" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -26965,10 +26928,22 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/blueshield) "xhH" = ( -/obj/structure/table/steel, -/obj/random/maintenance/medical, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "xmB" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -26998,15 +26973,12 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xuc" = ( -/obj/machinery/fire_alarm/east_mount, -/obj/structure/cable/green{ +/obj/structure/catwalk, +/obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "xug" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -27231,11 +27203,15 @@ /turf/simulated/floor/plating, /area/ai) "xUu" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/machinery/space_heater, +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/exploration/pilot_Office) +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "xVh" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -42254,9 +42230,9 @@ gqJ gqJ gqJ adi -aFX -aFX -aFX +aaQ +aaQ +aaQ vzZ bfe eeN @@ -42840,11 +42816,11 @@ jpv jpv jpv vMY -nOb +cnu rKd aKd lAT -jHN +arS gPk cIq cIq @@ -43033,18 +43009,18 @@ anE jpv jpv jpv -ahj -akk +kKk +cnu vUJ -dVA -fVL -jlx -dan -akk -rZH -iRO +aUi +aUi +aUi +aUi +cnu +lWV +aKd qnC -aqW +cnu arS aTv aih @@ -43228,17 +43204,17 @@ jpv jpv jpv kKk -lWV +cnu xUu -dVA -apI -aWA +aUi +aUi +aUi uEE -akk -aww -aMm +cnu +fVL +aUi aNV -aqW +cnu tAU aUv aEW @@ -43418,21 +43394,21 @@ gqJ gqJ gqJ avG -aFX -aFX -aFX +aaQ +aaQ +aaQ avx -jyZ -mBV +fRT xuc -tdn -apF -uMP -akk -rZH -aMm +xuc +xuc +xuc +xuc +fRT +xuc +aeH hYK -aqW +cnu afg aFq alk @@ -43616,17 +43592,17 @@ aaQ aaQ aaQ bNg -akk -akk -akk -akk +cnu +cnu +cnu +cnu uTP -akk -akk -ajR -azw -sei -aqW +cnu +cnu +cnu +aFq +aUi +cnu wyq aFq cnu @@ -43810,16 +43786,16 @@ aaQ aaQ aaQ jay -aqW +cnu vOW -cye -abi -nms -qcL +aKd +aUi +aTv +aUi gtg -oxz -aMm -aMm +cnu +byz +xuc fRT njG wUC @@ -44004,17 +43980,17 @@ rEc rEc rEc hAq -aqW -awu +cnu +vOW abF bqH -nms -qcL -bis -aFg -ebz -aFg -aqW +aTv +aUi +arS +cnu +aUi +aUi +cnu cjr aCQ ung @@ -44177,7 +44153,7 @@ abu dvT pKx aHD -aYR +abi qkT aqq nNR @@ -44198,14 +44174,14 @@ aaQ aaQ aaQ sja -aqW +cWu cWu lJp -eOV -lSR -ptn -oeA -aIS +cWu +cWu +cWu +cWu +cWu veT veT veT @@ -44394,12 +44370,12 @@ eoD wdZ veT atm +aIS +aIS veT -veT -veT -veT -veT -veT +hhy +dVA +qcL aes aAb arm @@ -44588,14 +44564,14 @@ aaQ dCB tpD gcc -okY -okY +gcc +gcc tpD jFJ kOx aXQ pis -egu +eOV egu aJw arY @@ -44790,7 +44766,7 @@ aAG aTu awz aHE -aHE +awu aKm aHE aDU @@ -44952,7 +44928,7 @@ nmA tPD otN tVG -pOJ +bqs atK bPV iBL @@ -44986,7 +44962,7 @@ agY aLC aLC ajU -aLC +jyZ aSk use ako @@ -45146,7 +45122,7 @@ vfQ vjS ezO aRS -pOJ +bqs atK bPV agQ @@ -45340,7 +45316,7 @@ lMv qSJ fef dIm -pOJ +bqs atK bPV aqQ @@ -45721,15 +45697,15 @@ glL qEh dSP xBA -bWN -bWN -bWN -bWN -bWN +akk +akk +akk +akk +akk hCW -iio -bWN -bWN +akk +akk +atK bPV bPV bPV @@ -45915,15 +45891,15 @@ aus aNG aIA aIA -bWN -aaA +dan +fam hFl ube -bWN -eEi -aEo -aoa -aTi +vRQ +wDH +ajR +akk +atK bPV aTE aTE @@ -46109,15 +46085,15 @@ amn hPQ auz auz -bWN -lud +dan +mmx lud hEX vRQ -aEo -aEo -aaA -aaA +wDH +aWA +akk +atK bPV ahg aWY @@ -46303,14 +46279,14 @@ amn aej acH acH -bWN +dan bwq qWZ eNg -bWN -aEo -aEo -aaA +mBV +pKh +apF +akk oNh bPV bPV @@ -46497,16 +46473,16 @@ amn aej acH acH -bWN -vRQ -bWN -bWN -bWN -byz -aEo -aaA -aaA -bWN +akk +akk +akk +ahj +akk +akk +hdv +akk +atK +aoa avu aEx avu @@ -46691,15 +46667,15 @@ atI aej acH acH -bWN -aEo -aEo -aEo -aEo -aEo -aEo -aEo -aEo +aqW +iRO +aFX +sei +nOb +aqW +oxz +jHN +apI oXj aEo aEo @@ -46885,13 +46861,13 @@ aej acH acH acH -bWN -aaA -aaA -aaA -aaA -aaA -aEo +okY +ptn +iio +aMm +aFg +aqW +jlx bWN wOC wOC @@ -47079,13 +47055,13 @@ acH acH acH acH -bWN -aaA -aaA -aaA -aaA -aaA -aEo +okY +ebz +tdn +aMm +aFg +aqW +eEi wOC wOC abD @@ -47273,12 +47249,12 @@ acH acH acH acH -bWN -aaA -aaA -aaA -aaA -aaA +okY +bis +iio +aMm +aFg +aqW aEo wOC afy @@ -47467,12 +47443,12 @@ acH acH acH acH -bWN -bWN -aaA -aaA -oNh -bWN +aqW +frZ +aMm +aMm +aFg +aqW exW wOC wOC @@ -47661,14 +47637,14 @@ acH afq afq aqG -acH -bWN +aqW +aqW xhH -aaA -aaA -bWN +azw +cye +aqW aEo -aaA +tIv wOC wOC wOC @@ -47856,13 +47832,13 @@ afq afq aqG acH -bWN -aeH -aaA -alg -bWN +aqW +aww +aMm +uMP +aqW pRv -aaA +nms wOC aUf aBF @@ -48048,13 +48024,13 @@ afq afq afq afq -afq aqG -bWN -bWN -bWN -bWN -bWN +aqG +aqW +rZH +aMm +oeA +aqW aEo aaA wOC @@ -48244,11 +48220,11 @@ afq afq afq aqG -aqG -aqG -afq -afq -bWN +aqW +rZH +lSR +rZH +aqW aEo aaA wOC @@ -48293,7 +48269,7 @@ mrz mrz mrz mrz -fam +fhj aKt aif cQT @@ -48437,12 +48413,12 @@ afq afq afq afq -afq aqG -afq -afq -afq -bWN +aqW +aqW +aqW +aqW +aqW aEo aaA wOC @@ -48631,9 +48607,9 @@ aGO afq afq afq -afq aqG -afq +aqG +aqG afq afq bWN @@ -49219,7 +49195,7 @@ afq aqG aqG bWN -aaA +aTi aaA aaA aaA From c5f18bb353bd362e75f3a5b906b2a1f977621104 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:28:45 +0100 Subject: [PATCH 17/20] missing lights, air alarm and vents --- maps/rift/levels/rift-06-surface3.dmm | 997 +++++++++++++++----------- 1 file changed, 589 insertions(+), 408 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index ac14ecc5ec0c..0cbc4dedb764 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -336,20 +336,17 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "abi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway2) +/turf/simulated/floor/tiled/monotile, +/area/hallway/secondary/docking_hallway) "abk" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 4 @@ -1466,12 +1463,21 @@ /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) "aeH" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/air_alarm/north_mount, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "aeK" = ( /obj/structure/curtain/open/bed{ name = "brown curtain"; @@ -2225,17 +2231,18 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "ahj" = ( -/obj/machinery/door/airlock/civilian/alt{ - req_one_access = list(67) +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/camera/network/exploration{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "ahk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -3233,9 +3240,10 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "ajR" = ( -/obj/structure/flora/pottedplant/minitree, +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/area/exploration/pilot_prep) "ajS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5395,9 +5403,14 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "apF" = ( -/obj/structure/flora/pottedplant/tropical, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + id = "pilot_prep"; + name = "Pilot Prep Window Shutters" + }, +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, +/area/exploration/pilot_prep) "apG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5417,12 +5430,9 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "apI" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/holopad/ship, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "apK" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -8007,32 +8017,17 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "awu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/landmark/spawnpoint/job/pilot, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/exploration) -"aww" = ( -/obj/machinery/suit_storage_unit/pilot, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/air_alarm/north_mount, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) +"aww" = ( +/obj/structure/table/rack/steel, +/obj/random/maintenance/clean, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "awx" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -9192,9 +9187,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "azw" = ( -/obj/machinery/door/window/westleft, +/obj/structure/flora/pottedplant/tropical, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/area/exploration/pilot_Office) "azx" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -11284,17 +11279,15 @@ /turf/simulated/floor/lythios43c/indoors, /area/maintenance/commandmaint) "aFX" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 }, -/obj/machinery/button/remote/blast_door{ - id = "pilot_prep"; - name = "Window Shutter Controll"; - dir = 4; - pixel_x = -25 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/machinery/air_alarm/west_mount, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/area/exploration/pilot_Office) "aFY" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -12354,18 +12347,8 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/exploration) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/bar/lower) "aIT" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 8 @@ -17204,11 +17187,18 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/shuttle) "aWA" = ( -/obj/machinery/holoposter{ - pixel_y = -32 +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/obj/effect/floor_decal/corner/beige/border{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "aWB" = ( /obj/machinery/power/apc/south_mount, /obj/machinery/light, @@ -18442,9 +18432,13 @@ /turf/simulated/floor/plating, /area/shuttle/emt/cockpit) "bis" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "bjs" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/bar) @@ -18525,6 +18519,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) +"bvb" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "bvV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -18538,12 +18544,17 @@ /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "byz" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/camera/network/civilian{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/machinery/button/remote/blast_door{ + id = "pilot_prep"; + name = "Window Shutter Controll"; + dir = 4; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "bDP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -18803,6 +18814,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) +"cpZ" = ( +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "cqj" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -18855,6 +18870,18 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) +"cvp" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "cvI" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/courser_dock) @@ -18873,37 +18900,17 @@ /turf/simulated/wall/prepainted, /area/bridge/bunker) "cye" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/effect/floor_decal/corner/beige/border{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/structure/window/basic{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/turf/simulated/floor/tiled/steel, +/area/exploration) "czm" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -19043,8 +19050,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "cWu" = ( -/turf/simulated/wall/prepainted/exploration, -/area/maintenance/bar/lower) +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "cXu" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -19090,14 +19104,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "dan" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - id = "Pilot_office_Shutter"; - name = "Pilot Office Window Shutters" +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, -/area/exploration/pilot_Office) +/area/maintenance/bar/lower) "dcy" = ( /obj/structure/table/wooden_reinforced, /obj/item/storage/photo_album{ @@ -19138,6 +19150,11 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) +"dmt" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "dnb" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/telescience_lab) @@ -19195,6 +19212,11 @@ /obj/structure/railing, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) +"dwD" = ( +/obj/structure/table/rack/steel, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "dwX" = ( /obj/structure/toilet, /obj/machinery/button/remote/airlock{ @@ -19393,18 +19415,23 @@ /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) "dVA" = ( -/obj/machinery/holoposter{ - pixel_x = -32 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) +"dVC" = ( +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "dWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19476,9 +19503,19 @@ /turf/simulated/floor/plating, /area/exploration/explorer_prep) "ebz" = ( -/obj/structure/table/reinforced, -/obj/item/toy/plushie/carp/void, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled, /area/exploration/pilot_prep) "edo" = ( /turf/simulated/wall/r_wall/prepainted/science, @@ -19496,9 +19533,6 @@ /area/hydroponics) "egu" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/monotile, /area/exploration) "ehI" = ( @@ -19892,6 +19926,12 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "eOH" = ( @@ -19903,8 +19943,17 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "eOV" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, /area/exploration) "ePV" = ( /obj/landmark/away, @@ -19990,8 +20039,13 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fam" = ( -/obj/machinery/computer/ship/sensors/planet, -/turf/simulated/floor/tiled/steel_grid, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + id = "Pilot_office_Shutter"; + name = "Pilot Office Window Shutters" + }, +/obj/effect/paint/palebottlegreen, +/turf/simulated/floor/plating, /area/exploration/pilot_Office) "fbX" = ( /obj/machinery/door/blast/regular, @@ -20012,12 +20066,15 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) "fef" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "ffg" = ( @@ -20115,13 +20172,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) -"frZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/air_alarm/north_mount, -/obj/machinery/fire_alarm/east_mount, -/obj/machinery/chemical_dispenser/catering/bar_soft, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "fsc" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ @@ -20314,13 +20364,11 @@ /turf/simulated/wall/r_wall/prepainted, /area/rift/trade_shop/landing_pad) "fRT" = ( -/obj/machinery/door/airlock/maintenance/int, -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "fSv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20398,11 +20446,21 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( -/obj/structure/table/rack/steel, -/obj/random/maintenance/clean, -/obj/random/tech_supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) +"fXa" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/medical, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/area/maintenance/commandmaint) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20635,6 +20693,23 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) +"gIq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "gNz" = ( /obj/structure/bed/chair/sofa/black, /turf/simulated/floor/carpet/bcarpet, @@ -20734,10 +20809,12 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) -"hdv" = ( -/obj/structure/catwalk, -/turf/simulated/wall/prepainted/civilian, -/area/exploration/pilot_Office) +"hbh" = ( +/obj/landmark/spawnpoint/job/pilot, +/obj/item/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "hfE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20760,19 +20837,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar) -"hhy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/steel, -/area/exploration) "hhF" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -20954,6 +21018,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "hDa" = ( @@ -20976,6 +21046,7 @@ /area/exploration/excursion_dock) "hEX" = ( /obj/structure/table/woodentable, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "hFl" = ( @@ -21065,6 +21136,15 @@ "hNS" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/commandmaint) +"hPo" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/secondary/docking_hallway) "hPM" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -21231,10 +21311,12 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "iio" = ( -/obj/landmark/spawnpoint/job/pilot, -/obj/item/stool/padded, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "ikZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21455,6 +21537,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "iPo" = ( @@ -21463,14 +21548,10 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "iRO" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration" - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "iXB" = ( @@ -21591,15 +21672,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "jlx" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "jmj" = ( /obj/machinery/light/small{ dir = 4 @@ -21715,17 +21801,13 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jyZ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, +/obj/machinery/door/airlock/maintenance/int, +/obj/machinery/door/firedoor, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21843,12 +21925,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jHN" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "jIg" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -22069,6 +22150,51 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) +"kdV" = ( +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) +"khq" = ( +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -22451,8 +22577,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "lud" = ( -/obj/structure/bed/chair/bay/comfy/black, -/obj/landmark/spawnpoint/job/pilot, +/obj/item/modular_computer/console/preset/civilian, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "lxt" = ( @@ -22652,8 +22777,11 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "lSR" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) @@ -22679,10 +22807,15 @@ /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) "lWV" = ( -/obj/structure/table/rack/steel, -/obj/random/maintenance/medical, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/area/maintenance/commandmaint) "lXf" = ( /obj/structure/railing{ dir = 8 @@ -22813,15 +22946,31 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) -"mmx" = ( -/obj/item/modular_computer/console/preset/civilian, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "mnJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"moj" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plushie/carp/void, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) +"mpF" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway2) "mpH" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22949,10 +23098,8 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "mBV" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/catwalk, +/turf/simulated/wall/prepainted/civilian, /area/exploration/pilot_Office) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ @@ -23098,6 +23245,13 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfaceeva/airlock/arrivals/secondary) +"mUT" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "mVj" = ( /obj/machinery/light{ dir = 4 @@ -23265,13 +23419,12 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "nms" = ( -/obj/structure/table/steel, -/obj/random/maintenance/research, -/obj/random/maintenance/security, -/obj/random/tech_supply, -/obj/random/tech_supply, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23423,11 +23576,13 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "nOb" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/machinery/power/apc/west_mount, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/table/steel, +/obj/random/maintenance/research, +/obj/random/maintenance/security, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "nQb" = ( /obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/plating, @@ -23496,20 +23651,14 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "oeA" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "ofq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -23529,13 +23678,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) "okY" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - id = "pilot_prep"; - name = "Pilot Prep Window Shutters" +/obj/machinery/light{ + dir = 4 }, -/obj/effect/paint/palebottlegreen, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) +"olr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "ooQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -23611,6 +23763,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "ovg" = ( @@ -23647,12 +23802,17 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxz" = ( -/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "oAw" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -24005,10 +24165,12 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "ptn" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "pul" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -24100,16 +24262,6 @@ /obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) -"pKh" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "pKx" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -24246,18 +24398,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "qcL" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/machinery/camera/network/exploration{ - dir = 4 - }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/machinery/computer/ship/sensors/planet, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24718,6 +24861,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "rnV" = ( @@ -24991,11 +25140,10 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "sei" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, +/obj/structure/bed/chair/bay/comfy/black, +/obj/landmark/spawnpoint/job/pilot, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/area/exploration/pilot_Office) "sja" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25200,6 +25348,16 @@ }, /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) +"sWs" = ( +/obj/machinery/door/window/westleft, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "sYS" = ( /obj/structure/table/hardwoodtable, /obj/structure/disposalpipe/segment, @@ -25243,9 +25401,12 @@ /turf/simulated/floor/plating, /area/exploration/excursion_dock) "tdn" = ( -/obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "tfz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -25480,13 +25641,6 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/bar) -"tIv" = ( -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/item/stack/cable_coil/random, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "tIJ" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -25636,6 +25790,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "uhz" = ( @@ -25813,22 +25968,12 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) "uMP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "uOE" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -26264,6 +26409,17 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"vAo" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Exploration" + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "vCA" = ( /obj/structure/railing{ dir = 4 @@ -26400,6 +26556,24 @@ /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"vRw" = ( +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26413,18 +26587,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) "vRQ" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) "vUc" = ( @@ -26765,12 +26945,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"wDH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "wEy" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -26975,7 +27149,7 @@ "xuc" = ( /obj/structure/catwalk, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) @@ -27329,6 +27503,13 @@ }, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"yeX" = ( +/obj/structure/table/reinforced, +/obj/machinery/air_alarm/north_mount, +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "yfB" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -43017,7 +43198,7 @@ aUi aUi aUi cnu -lWV +dwD aKd qnC cnu @@ -43211,7 +43392,7 @@ aUi aUi uEE cnu -fVL +aww aUi aNV cnu @@ -43398,15 +43579,15 @@ aaQ aaQ aaQ avx -fRT -xuc -xuc -xuc -xuc -xuc -fRT +jyZ +uMP +uMP +uMP +uMP +uMP +jyZ +uMP xuc -aeH hYK cnu afg @@ -43794,9 +43975,9 @@ aTv aUi gtg cnu -byz -xuc -fRT +dan +uMP +jyZ njG wUC aGm @@ -44153,7 +44334,7 @@ abu dvT pKx aHD -abi +mpF qkT aqq nNR @@ -44174,14 +44355,14 @@ aaQ aaQ aaQ sja -cWu -cWu +aIS +aIS lJp -cWu -cWu -cWu -cWu -cWu +aIS +aIS +aIS +aIS +aIS veT veT veT @@ -44370,12 +44551,12 @@ eoD wdZ veT atm -aIS -aIS +eOV +eOV veT -hhy -dVA -qcL +aWA +khq +ahj aes aAb arm @@ -44571,8 +44752,8 @@ jFJ kOx aXQ pis -eOV egu +iio aJw arY bnN @@ -44732,7 +44913,7 @@ aBX aRr lMv neB -uag +abi imV bqs atK @@ -44766,7 +44947,7 @@ aAG aTu awz aHE -awu +oxz aKm aHE aDU @@ -44962,7 +45143,7 @@ agY aLC aLC ajU -jyZ +cye aSk use ako @@ -45120,8 +45301,8 @@ rxA jCn vfQ vjS -ezO -aRS +hPo +bis bqs atK bPV @@ -45891,13 +46072,13 @@ aus aNG aIA aIA -dan fam +qcL hFl ube -vRQ -wDH -ajR +aFX +dVA +cpZ akk atK bPV @@ -46085,13 +46266,13 @@ amn hPQ auz auz -dan -mmx +fam lud +sei hEX vRQ -wDH -aWA +oeA +dVC akk atK bPV @@ -46279,13 +46460,13 @@ amn aej acH acH -dan +fam bwq qWZ eNg -mBV -pKh -apF +bvb +cWu +azw akk oNh bPV @@ -46476,10 +46657,10 @@ acH akk akk akk -ahj +vRw akk akk -hdv +mBV akk atK aoa @@ -46668,14 +46849,14 @@ aej acH acH aqW -iRO -aFX -sei -nOb -aqW -oxz +vAo +byz +cvp jHN -apI +aqW +tdn +ptn +mUT oXj aEo aEo @@ -46861,13 +47042,13 @@ aej acH acH acH -okY -ptn -iio -aMm +apF +fRT +awu +nms aFg aqW -jlx +lWV bWN wOC wOC @@ -47055,11 +47236,11 @@ acH acH acH acH -okY -ebz -tdn -aMm -aFg +apF +moj +apI +fVL +dmt aqW eEi wOC @@ -47249,10 +47430,10 @@ acH acH acH acH -okY -bis -iio -aMm +apF +ajR +hbh +iRO aFg aqW aEo @@ -47444,9 +47625,9 @@ acH acH acH aqW -frZ -aMm +yeX aMm +fVL aFg aqW exW @@ -47640,11 +47821,11 @@ aqG aqW aqW xhH -azw -cye +sWs +kdV aqW aEo -tIv +fXa wOC wOC wOC @@ -47833,12 +48014,12 @@ afq aqG acH aqW -aww -aMm -uMP +aeH +lSR +gIq aqW pRv -nms +nOb wOC aUf aBF @@ -48027,9 +48208,9 @@ afq aqG aqG aqW -rZH -aMm -oeA +jlx +olr +ebz aqW aEo aaA @@ -48222,7 +48403,7 @@ afq aqG aqW rZH -lSR +okY rZH aqW aEo From 4e30a34cb89215cee871824f904c93c7fa419916 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:29:48 +0100 Subject: [PATCH 18/20] more decor --- maps/rift/levels/rift-06-surface3.dmm | 1246 ++++++++++++++----------- 1 file changed, 717 insertions(+), 529 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 0cbc4dedb764..21ab9599df09 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -336,17 +336,19 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "abi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Exploration" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/spline/fancy{ + dir = 9 }, /turf/simulated/floor/tiled/monotile, -/area/hallway/secondary/docking_hallway) +/area/exploration/pilot_prep) "abk" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 4 @@ -1476,6 +1478,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/machinery/air_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "aeK" = ( @@ -2231,18 +2236,17 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "ahj" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 }, -/obj/machinery/camera/network/exploration{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/tiled/monotile, +/area/hallway/secondary/docking_hallway) "ahk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -3240,10 +3244,11 @@ /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "ajR" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/exploration/pilot_Office) "ajS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5403,13 +5408,15 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "apF" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - id = "pilot_prep"; - name = "Pilot Prep Window Shutters" +/obj/structure/table/reinforced, +/obj/machinery/air_alarm/north_mount, +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/obj/effect/floor_decal/spline/fancy{ + dir = 5 }, -/obj/effect/paint/palebottlegreen, -/turf/simulated/floor/plating, +/obj/item/storage/box/glasses/meta, +/turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) "apG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5430,7 +5437,10 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "apI" = ( -/obj/machinery/holopad/ship, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/landmark/spawnpoint/job/pilot, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "apK" = ( @@ -8017,11 +8027,17 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "awu" = ( -/obj/landmark/spawnpoint/job/pilot, -/obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/access_button/airlock_interior{ + master_tag = "civ_airlock_two"; + pixel_x = -26; + pixel_y = -8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "aww" = ( /obj/structure/table/rack/steel, /obj/random/maintenance/clean, @@ -9187,9 +9203,14 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "azw" = ( -/obj/structure/flora/pottedplant/tropical, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/area/exploration/pilot_prep) "azx" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -11004,6 +11025,11 @@ /area/exploration/courser_dock) "aFg" = ( /obj/structure/closet/secure_closet/pilot, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "aFh" = ( @@ -11279,14 +11305,32 @@ /turf/simulated/floor/lythios43c/indoors, /area/maintenance/commandmaint) "aFX" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/air_alarm/west_mount, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/closet/medical_wall{ + pixel_x = 30 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, +/obj/item/storage/single_use/med_pouch/trauma, +/obj/item/storage/single_use/med_pouch/toxin, +/obj/item/storage/single_use/med_pouch/radiation, +/obj/item/storage/single_use/med_pouch/oxyloss, +/obj/item/storage/single_use/med_pouch/overdose, +/obj/item/storage/single_use/med_pouch/burn, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "aFY" = ( /obj/effect/floor_decal/borderfloor{ @@ -12347,8 +12391,12 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIS" = ( -/turf/simulated/wall/prepainted/exploration, -/area/maintenance/bar/lower) +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/exploration/pilot_Office) "aIT" = ( /obj/effect/floor_decal/industrial/halfstair{ dir = 8 @@ -12861,11 +12909,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "aKd" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/tiled/monotile, +/area/exploration) "aKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -13544,7 +13593,10 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "aMm" = ( -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) "aMn" = ( /obj/effect/floor_decal/industrial/halfstair, @@ -17188,14 +17240,14 @@ /area/rift/surfacebase/shuttle) "aWA" = ( /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ - dir = 9 - }, -/obj/machinery/light{ dir = 8 }, +/obj/machinery/camera/network/exploration{ + dir = 4 + }, /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/steel, /area/exploration) @@ -18432,13 +18484,30 @@ /turf/simulated/floor/plating, /area/shuttle/emt/cockpit) "bis" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) +"bjm" = ( +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/spline/fancy{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "bjs" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/bar) @@ -18519,18 +18588,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) -"bvb" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "bvV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -18541,20 +18598,18 @@ /area/hallway/secondary/docking_hallway) "bwq" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 5 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "byz" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "pilot_prep"; - name = "Window Shutter Controll"; - dir = 4; - pixel_x = -25 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "bDP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -18601,6 +18656,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"bID" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "bIN" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, @@ -18702,6 +18764,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"bSx" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/obj/machinery/microwave, +/obj/item/storage/box/donkpockets{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "bUd" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_containers/food/condiment/flour, @@ -18762,6 +18836,18 @@ }, /turf/simulated/wall/prepainted, /area/rift/surfacebase/outside/outside3) +"ccq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "cgU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -18805,6 +18891,22 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"cnq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "cnu" = ( /turf/simulated/wall/prepainted, /area/maintenance/bar/lower) @@ -18814,10 +18916,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) -"cpZ" = ( -/obj/structure/flora/pottedplant/minitree, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "cqj" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -18870,18 +18968,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) -"cvp" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "cvI" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/courser_dock) @@ -18900,17 +18986,13 @@ /turf/simulated/wall/prepainted, /area/bridge/bunker) "cye" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/lathe/autolathe, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "czm" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -19050,15 +19132,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "cWu" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/bar/lower) "cXu" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -19104,12 +19179,15 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "dan" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "dcy" = ( /obj/structure/table/wooden_reinforced, /obj/item/storage/photo_album{ @@ -19150,11 +19228,6 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) -"dmt" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/machinery/light, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "dnb" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/telescience_lab) @@ -19212,11 +19285,6 @@ /obj/structure/railing, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) -"dwD" = ( -/obj/structure/table/rack/steel, -/obj/random/maintenance/medical, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) "dwX" = ( /obj/structure/toilet, /obj/machinery/button/remote/airlock{ @@ -19415,23 +19483,18 @@ /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) "dVA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/machinery/door/window/westleft, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) -"dVC" = ( -/obj/machinery/holoposter{ - pixel_y = -32 +/obj/effect/floor_decal/spline/fancy{ + dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/area/exploration/pilot_prep) "dWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19503,19 +19566,13 @@ /turf/simulated/floor/plating, /area/exploration/explorer_prep) "ebz" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_prep) "edo" = ( /turf/simulated/wall/r_wall/prepainted/science, @@ -19812,6 +19869,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"eHR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "eIi" = ( /obj/machinery/air_alarm{ dir = 4; @@ -19932,7 +19997,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "eOH" = ( /obj/machinery/door/airlock/maintenance/common, @@ -19943,18 +20011,23 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "eOV" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/door/airlock/civilian/alt{ + req_one_access = list(67) + }, +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/exploration) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_Office) "ePV" = ( /obj/landmark/away, /obj/machinery/holopad, @@ -20041,12 +20114,12 @@ "fam" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ - id = "Pilot_office_Shutter"; - name = "Pilot Office Window Shutters" + id = "pilot_prep"; + name = "Pilot Prep Window Shutters" }, /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, -/area/exploration/pilot_Office) +/area/exploration/pilot_prep) "fbX" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/reinforced, @@ -20364,11 +20437,13 @@ /turf/simulated/wall/r_wall/prepainted, /area/rift/trade_shop/landing_pad) "fRT" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/machinery/door/airlock/maintenance/int, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "fSv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20446,21 +20521,14 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "fVL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + id = "Pilot_office_Shutter"; + name = "Pilot Office Window Shutters" }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) -"fXa" = ( -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/item/stack/cable_coil/random, +/obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/area/exploration/pilot_Office) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20479,9 +20547,20 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "gcc" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/exploration) +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "pilot_prep"; + name = "Window Shutter Controll"; + dir = 4; + pixel_x = -25 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "ghf" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -20693,23 +20772,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) -"gIq" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) "gNz" = ( /obj/structure/bed/chair/sofa/black, /turf/simulated/floor/carpet/bcarpet, @@ -20809,12 +20871,6 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) -"hbh" = ( -/obj/landmark/spawnpoint/job/pilot, -/obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "hfE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20897,6 +20953,13 @@ }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/bar) +"hrG" = ( +/obj/machinery/computer/ship/sensors/planet, +/obj/effect/floor_decal/spline/fancy{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "hsD" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, @@ -20960,6 +21023,12 @@ /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"hAx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/wall/prepainted/civilian, +/area/exploration/pilot_prep) "hAM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -21047,7 +21116,7 @@ "hEX" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "hFl" = ( /obj/machinery/camera/network/civilian{ @@ -21059,7 +21128,10 @@ pixel_x = -24; dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "hGl" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -21136,15 +21208,6 @@ "hNS" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/commandmaint) -"hPo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/secondary/docking_hallway) "hPM" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -21243,6 +21306,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"iay" = ( +/obj/item/modular_computer/console/preset/civilian, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "icY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -21311,12 +21381,20 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "iio" = ( -/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, -/area/exploration) +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway2) "ikZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21548,12 +21626,11 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "iRO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "iXB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -21672,20 +21749,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "jlx" = ( -/obj/machinery/suit_storage_unit/pilot, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/machinery/holoposter{ + pixel_x = -32 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "jmj" = ( /obj/machinery/light/small{ dir = 4 @@ -21800,14 +21875,33 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"jyZ" = ( -/obj/machinery/door/airlock/maintenance/int, -/obj/machinery/door/firedoor, +"jvK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/turf/simulated/floor/tiled/steel, +/area/exploration) +"jyZ" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21925,11 +22019,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "jHN" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/machinery/power/apc/west_mount, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/random/maintenance/clean, +/obj/structure/table/rack/shelf/steel, +/obj/random/coin, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "jIg" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -22015,6 +22109,24 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"jPH" = ( +/obj/machinery/suit_storage_unit/pilot, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "jQb" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -22055,6 +22167,16 @@ "jTJ" = ( /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"jVd" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "jVy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/lino, @@ -22150,51 +22272,10 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) -"kdV" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/turf/simulated/floor/tiled, -/area/exploration/pilot_prep) -"khq" = ( -/obj/machinery/holoposter{ - pixel_x = -32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/steel, -/area/exploration) +"kep" = ( +/obj/structure/catwalk, +/turf/simulated/wall/prepainted/civilian, +/area/exploration/pilot_Office) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -22267,6 +22348,15 @@ }, /turf/simulated/floor/grass, /area/hydroponics) +"koz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/secondary/docking_hallway) "kps" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -22349,6 +22439,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) +"kIZ" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "kJm" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -22487,13 +22584,17 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "lmh" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 + dir = 6 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 + dir = 6 }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) @@ -22543,6 +22644,16 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfaceeva/airlock/arrivals) +"lrh" = ( +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/exploration/pilot_Office) "lrF" = ( /obj/structure/sink{ pixel_y = 18 @@ -22577,8 +22688,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "lud" = ( -/obj/item/modular_computer/console/preset/civilian, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/bed/chair/bay/comfy/black, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "lxt" = ( /obj/effect/paint/black, @@ -22777,14 +22889,12 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "lSR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "lWu" = ( /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ @@ -22807,15 +22917,41 @@ /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) "lWV" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "lXf" = ( /obj/structure/railing{ dir = 8 @@ -22951,26 +23087,6 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"moj" = ( -/obj/structure/table/reinforced, -/obj/item/toy/plushie/carp/void, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) -"mpF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/secondary/docking_hallway2) "mpH" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23051,6 +23167,10 @@ "mvz" = ( /turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway) +"mvN" = ( +/obj/machinery/holopad/ship, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "mxx" = ( /obj/effect/floor_decal/corner/beige/full{ dir = 8 @@ -23098,9 +23218,18 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "mBV" = ( -/obj/structure/catwalk, -/turf/simulated/wall/prepainted/civilian, -/area/exploration/pilot_Office) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/exploration) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access"; @@ -23190,6 +23319,13 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"mNl" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "mOy" = ( /turf/simulated/floor/tiled, /area/rnd/telescience_lab) @@ -23245,13 +23381,6 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfaceeva/airlock/arrivals/secondary) -"mUT" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "mVj" = ( /obj/machinery/light{ dir = 4 @@ -23419,12 +23548,11 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "nms" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/table/rack/steel, +/obj/random/maintenance/medical, +/obj/random/coin, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23485,6 +23613,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"nvu" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/medical, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "nyL" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -23559,6 +23694,16 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"nMD" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/light, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "nNR" = ( /obj/machinery/holopad, /obj/effect/floor_decal/borderfloor/corner{ @@ -23576,13 +23721,18 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "nOb" = ( -/obj/structure/table/steel, -/obj/random/maintenance/research, -/obj/random/maintenance/security, -/obj/random/tech_supply, -/obj/random/tech_supply, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled/steel, +/area/exploration) "nQb" = ( /obj/machinery/door/airlock/maintenance/int, /turf/simulated/floor/plating, @@ -23654,10 +23804,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "ofq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -23678,17 +23834,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) "okY" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) -"olr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/exploration) "ooQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23802,17 +23950,18 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "0-8" }, -/turf/simulated/floor/tiled/monotile, -/area/exploration) +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/exploration/pilot_Office) "oAw" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -23928,6 +24077,17 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"oRz" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/pilot_prep) "oRA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -24165,12 +24325,15 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "ptn" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/item/toy/plushie/carp/void, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "pul" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -24398,9 +24561,11 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "qcL" = ( -/obj/machinery/computer/ship/sensors/planet, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) +/obj/landmark/spawnpoint/job/pilot, +/obj/item/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24765,7 +24930,10 @@ /area/bridge/bridge_hallway) "qWZ" = ( /obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "qYn" = ( /obj/machinery/door/airlock/maintenance/common, @@ -24845,6 +25013,14 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"rkv" = ( +/obj/structure/table/steel, +/obj/random/maintenance/research, +/obj/random/maintenance/security, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "rkD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -24940,6 +25116,14 @@ "rAi" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/excursion_dock) +"rBa" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/secondary/docking_hallway) "rBb" = ( /obj/structure/table/hardwoodtable, /obj/item/flame/candle{ @@ -25098,6 +25282,9 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "scN" = ( @@ -25140,9 +25327,17 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "sei" = ( -/obj/structure/bed/chair/bay/comfy/black, -/obj/landmark/spawnpoint/job/pilot, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/air_alarm/west_mount, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "sja" = ( /obj/effect/floor_decal/borderfloor, @@ -25348,16 +25543,6 @@ }, /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) -"sWs" = ( -/obj/machinery/door/window/westleft, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "sYS" = ( /obj/structure/table/hardwoodtable, /obj/structure/disposalpipe/segment, @@ -25401,12 +25586,17 @@ /turf/simulated/floor/plating, /area/exploration/excursion_dock) "tdn" = ( -/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration) "tfz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -25791,8 +25981,30 @@ dir = 8 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) +"udr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/machinery/suit_cycler/pilot, +/obj/effect/floor_decal/industrial/outline/red, +/obj/effect/floor_decal/spline/fancy, +/turf/simulated/floor/tiled, +/area/exploration/pilot_prep) "uhz" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -25968,12 +26180,11 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) "uMP" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/obj/landmark/spawnpoint/job/pilot, +/obj/item/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/exploration/pilot_prep) "uOE" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -26409,17 +26620,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"vAo" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration" - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "vCA" = ( /obj/structure/railing{ dir = 4 @@ -26556,24 +26756,6 @@ /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"vRw" = ( -/obj/machinery/door/airlock/civilian/alt{ - req_one_access = list(67) - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_Office) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26605,7 +26787,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/wood, /area/exploration/pilot_Office) "vUc" = ( /obj/effect/floor_decal/borderfloor{ @@ -26630,6 +26812,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"vVL" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "vXg" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -27116,6 +27308,9 @@ /obj/structure/window/basic{ dir = 8 }, +/obj/effect/floor_decal/spline/fancy{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "xmB" = ( @@ -27149,7 +27344,7 @@ "xuc" = ( /obj/structure/catwalk, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) @@ -27503,13 +27698,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/courser/general) -"yeX" = ( -/obj/structure/table/reinforced, -/obj/machinery/air_alarm/north_mount, -/obj/machinery/fire_alarm/east_mount, -/obj/machinery/chemical_dispenser/catering/bar_soft, -/turf/simulated/floor/tiled/steel_grid, -/area/exploration/pilot_prep) "yfB" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -42999,7 +43187,7 @@ jpv vMY cnu rKd -aKd +iRO lAT arS gPk @@ -43198,8 +43386,8 @@ aUi aUi aUi cnu -dwD -aKd +nms +iRO qnC cnu arS @@ -43579,15 +43767,15 @@ aaQ aaQ aaQ avx -jyZ -uMP -uMP -uMP -uMP -uMP -jyZ -uMP +fRT +xuc xuc +xuc +xuc +xuc +fRT +xuc +byz hYK cnu afg @@ -43969,15 +44157,15 @@ aaQ jay cnu vOW -aKd +iRO aUi aTv aUi gtg cnu -dan -uMP -jyZ +mNl +xuc +fRT njG wUC aGm @@ -44334,7 +44522,7 @@ abu dvT pKx aHD -mpF +iio qkT aqq nNR @@ -44355,14 +44543,14 @@ aaQ aaQ aaQ sja -aIS -aIS +cWu +cWu lJp -aIS -aIS -aIS -aIS -aIS +cWu +cWu +cWu +cWu +cWu veT veT veT @@ -44551,12 +44739,12 @@ eoD wdZ veT atm -eOV -eOV +mBV +mBV veT +nOb +jlx aWA -khq -ahj aes aAb arm @@ -44744,16 +44932,16 @@ aaQ aaQ dCB tpD -gcc -gcc -gcc +okY +okY +okY tpD jFJ kOx aXQ pis egu -iio +aKd aJw arY bnN @@ -44913,7 +45101,7 @@ aBX aRr lMv neB -abi +ahj imV bqs atK @@ -44947,7 +45135,7 @@ aAG aTu awz aHE -oxz +tdn aKm aHE aDU @@ -45106,7 +45294,7 @@ tIJ jQb jkD nmA -tPD +awu otN tVG bqs @@ -45143,7 +45331,7 @@ agY aLC aLC ajU -cye +jvK aSk use ako @@ -45301,8 +45489,8 @@ rxA jCn vfQ vjS -hPo -bis +koz +rBa bqs atK bPV @@ -46072,13 +46260,13 @@ aus aNG aIA aIA -fam -qcL +fVL +hrG hFl ube -aFX -dVA -cpZ +sei +oeA +aIS akk atK bPV @@ -46266,13 +46454,13 @@ amn hPQ auz auz -fam +fVL +iay lud -sei hEX vRQ -oeA -dVC +jVd +lrh akk atK bPV @@ -46460,13 +46648,13 @@ amn aej acH acH -fam +fVL bwq qWZ eNg -bvb -cWu -azw +aFX +oxz +ajR akk oNh bPV @@ -46657,10 +46845,10 @@ acH akk akk akk -vRw +eOV akk akk -mBV +kep akk atK aoa @@ -46849,14 +47037,14 @@ aej acH acH aqW -vAo -byz -cvp -jHN +abi +gcc +jyZ +oRz aqW -tdn -ptn -mUT +lSR +kIZ +bID oXj aEo aEo @@ -47042,14 +47230,14 @@ aej acH acH acH -apF -fRT -awu -nms +fam +ptn +qcL +bis aFg aqW -lWV -bWN +vVL +aTi wOC wOC wOC @@ -47236,11 +47424,11 @@ acH acH acH acH -apF -moj -apI -fVL -dmt +fam +bSx +mvN +dan +nMD aqW eEi wOC @@ -47430,10 +47618,10 @@ acH acH acH acH -apF -ajR -hbh -iRO +fam +cye +uMP +eHR aFg aqW aEo @@ -47625,11 +47813,11 @@ acH acH acH aqW -yeX +apF aMm -fVL +ccq aFg -aqW +hAx exW wOC wOC @@ -47821,11 +48009,11 @@ aqG aqW aqW xhH -sWs -kdV +dVA +lWV aqW aEo -fXa +nvu wOC wOC wOC @@ -48015,11 +48203,11 @@ aqG acH aqW aeH -lSR -gIq +ebz +udr aqW pRv -nOb +rkv wOC aUf aBF @@ -48208,9 +48396,9 @@ afq aqG aqG aqW -jlx -olr -ebz +jPH +apI +cnq aqW aEo aaA @@ -48402,8 +48590,8 @@ afq afq aqG aqW -rZH -okY +bjm +azw rZH aqW aEo @@ -49573,7 +49761,7 @@ cYF bWN bWN bWN -ate +jHN aaA aEx aEo From 5417ebb146ed9238c1cb5539d2aecdaea6617a70 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:04:53 +0100 Subject: [PATCH 19/20] Catwalk under wall removed --- maps/rift/levels/rift-06-surface3.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 21ab9599df09..8e3595af5575 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -22272,10 +22272,6 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) -"kep" = ( -/obj/structure/catwalk, -/turf/simulated/wall/prepainted/civilian, -/area/exploration/pilot_Office) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -46848,7 +46844,7 @@ akk eOV akk akk -kep +akk akk atK aoa From 89b6a307109128b086067e27c74beabd11c1a5d4 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:30:18 +0100 Subject: [PATCH 20/20] new look for pilot lockers --- .../_closet_appearance_definitions.dm | 11 +++++++++++ .../crates_lockers/closets/secure/explorer.dm | 4 +--- icons/obj/closets/decals/closet.dmi | Bin 3264 -> 3276 bytes 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm index a246156bea80..e3886aa0fd44 100644 --- a/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm @@ -543,6 +543,17 @@ "research" = COLOR_PURPLE ) +/singleton/closet_appearance/secure_closet/pilot + color = COLOR_CYAN_DARK + decals = list( + "lower_side_vent" + ) + extra_decals = list( + "stripe_vertical_left_full" = COLOR_BLUE_LIGHT, + "stripe_vertical_right_full" = COLOR_BLUE_LIGHT, + "pilot" = COLOR_SUN + ) + /singleton/closet_appearance/secure_closet/rd extra_decals = list( "stripe_vertical_mid_full" = COLOR_CLOSET_GOLD, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm index 18005f47824e..2ef79c88ac1d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm @@ -77,10 +77,8 @@ //Pilot Locker /obj/structure/closet/secure_closet/pilot name = "pilot locker" - closet_appearance = /singleton/closet_appearance/secure_closet/expedition + closet_appearance = /singleton/closet_appearance/secure_closet/pilot req_access = list(ACCESS_GENERAL_PILOT) - -/obj/structure/closet/secure_closet/pilot starts_with = list( /obj/item/storage/backpack/parachute, /obj/item/storage/box/survival_knife, diff --git a/icons/obj/closets/decals/closet.dmi b/icons/obj/closets/decals/closet.dmi index ea42c1f5350f35f5792852b01d73ac03e520b93a..82db26802f97a4786d6e6ac2144dd3b231808abf 100644 GIT binary patch delta 2797 zcmYjSc~lbU7XLs{LK9}pr00S@9W%$&o-QRIZ4(Vq(i9WKEztz^(ad}2ynD{~$9KPbe)rtp`Q6{g+0nBj(+E;? z`#UH29eiTZ`fciY8ue(k;UPEU6QM=ZCWupwwkz6>+oNi&R0ln3a*ceo_j_nexE^wF zuRa=Zx|nzS$2)!XMZ6nUX~$CR0+^Sn`iGNhBp;mKOg$d>t)Yq;HW-GR42d7zMzRs7 zo$Dxbdex8)b1!r9=UuorML&Ec_()DZ_2aOMZ;O4~-km>>XGm!WNGc7t$fBs60hPKjoc4;ha;YR`M3GUSTXa$^ZqN`Oj`r?Yj!o%vtcZV0s z0VCu=IIDh*Hcg44B|4-$=Y_4R&MB$NO4ZY90YDDA{^UrAVb1a$E@{8m(YcW77(7Mg z%nTtsoR#8KCrqo6lW7Fko%*hfWA3j>Xq%=E{^c#4*Y3wir0LAVOVANS_4moWQQ!KV zAzJu(>-ao1_ISOqBV0N>wxWdCwl&9!H7=J9^FK($+XcGD6gJXkuZL zt$ya5liY`~CL?hR}l4cftNxhomQS?9Ke_?8Jq33-Q84XH;BV zPE#P>#;Q$qKvfeMUqKeAn1b{3!!AN|vW*K2k18!KjXDSijZWY*9!^&aIB?WxY#>w( zRNV1Dna5;4iJQ%}xkSa~d(viNx(HeM0RKG}mr$mzu70X@usfBV{?Ock1%f680#0RR zrCtL6O{ph8VU=}%X3H9FA2EZejzJH^cVqB8&nc9 z!Wu;A#^&Z)YZ=G?B#||w(#PK*#BK#&vSSo?8Ffy9ynaUBQl=AIhyZ-+XROaCMC=N=_mM|$VqYhoff)+h zEyF95M|@yKiR{^(=b3?U)YTCs{XlS|WPQZo@n};1 zW|sJ>e$$cpk#HY;)8q#0*4YWh(%e||7qag+h#~8H6wA@j1NwMODFnjUqqd!qq-H|v zAp^y1V(uAlN%CUttqRnxMwYSQTuoV8QCA%N)FjTtLN>IPd6fk$>t6PRSH=7{V|kxN z2H+DK&@H1O)hEotqaB-3FS~IKxZeflz_%?So2B|X(aTp_vups5R)KVeem>sxzk*8W zUOT%UKKv7o_7}XLwY)7w0tFnDb@HajV9pT$^M-ju9niwkorCKtSW&b2fA`;5_W*U?bHyWcYwd{Irs#mk=Nf2+sZXP)w?? zCO#v~1pzjek#w}vfi1{YE(>~y|BXM8arXg?oDWpxBx6#LID_z%;iJcE8&Z&l;&*f?GPzLj|Nb=0PeDP@k$>&IAmVMwV z+1FQ37{t0rtCRHGt8+%yh=Bb=-B`{rwnto_ONldG128-&8 z?ao|mRvcf?u48o${Y=#1(Au`tZaXNS5U%QfZ4<;A9p}yt_OD=|%iEuxjJ4J6#H?uI zpU!eauA!xGBTtb~0Nr8tH@k)a1U7iCtM5~F`ipW-Awh!^m!}NN^nCfIjlc*~+sE*Q zqG$!+P;6p&)jw8BvCqlDS3H#Y+SO*=!MObX2JD;5m*g*N<Rl%D z`rakgp}d0>=Cjiv#gwbUzQNYWe>V6Fj>@{MA}paAWnAchgIrb{Eyw9#G~PBCW# zgt?`ixt%=Wo{qWZ7OW-^bjK>Jt!Y&hYcCK9$zvG+Fw3ic4RIjCDikOY%YwO68@XX> zV1BAG%;MLn?VENf17F(El~r31ewZi-INPewsMlnRZE&Ad6cy2sAJ4bJuJEIl0>@@; zWSPaY#hQ0OinAmn=5a;H<&ay-7y?b{|A!i+D_;22l<@{qp zr2g{y3t3m|qE>o4_A8+3o%nU3b;;!1afsUmcw|YOcDS2&)f@WqV5%cnb%6r}MGq+a z(1;d#w&ui>4Jjpy`^XSj?n_NgZDI+OAwUcBmgNXIzbwbKGPsW-VqGn#ccqPwc3-LB zig>059gR=3>9kd$~hkogSRlsNKT?B{#Mm~|M3YVHhD3~6Nm>-q$jImG z!xGpZvmzl&%nN==Pgi|JzjuENLd)FT{860O*h)4gL{0u8ua*Z_Xuo3*z~7he0aDGv z3?#!(#gJy_4zIk|U1A>@U)`&Fx@XlIGp}!|C@MwzH4N7(9ZEs|y)lYDC#t@F0|qIV ztl2aTCjs#U-8oOGV9(Iz+XN#Rpsg|CtFL>K`~x=m1jy5V?(TKwz9Z>^*fMJ6LsZ=LI|-!|;OYZr_A(0z6`W TJbm*zP=xCNkDn@?{I327v~NpD delta 2782 zcmY+Fdpr~BAIG0vu-vv%8Degwgq-7EnMEBr)vS}dT(VNhObLaxDdiMJEs41-y~-`A zMkRAgO+vGBn+d-<;ut2hVYB_#@4U_*zvuOOUeD|G{XVbfdA{H0^L>9i^_umv%^{UH zH@d6T;3y@so6$$9RtKM$?cKjAAhu*;Ga~5aj(&q(>l2>YY4qWrGR#8_wkPO(_1f#! zz~B+K_g|X{al5~H&pRR~uuZk(FaK{wHuj_s>eeTvxpp76e<)>>x)>LQ7efwqqJ1|H z4reo0`Ibcs-hbRc*g_z!%+as!6uirL(WX1zxxavijSy}YKc$}fjMrIKoeL6hJx{3n zkcg9Cj&RgXqhD;j^(LC(8++y!^YU~|kyrGgWOKS#G5!7@@W5!xrxe@8sH`BiW$)N- zR~MT!Y0pc&;c|OV26@uGsO>|Z<6&v2hg|Cd;?l~l3PaMghVL14Rp*Uja5sAXwxFt4 z;elxtN=-Hl-=MaJd00anzN&P+20*>rYxgdna|P3%UCBcO>p0)-QibhvbS|EtIKZ37qdf@~a$9v@d|+tOM_i zwY9a?h9+OQ5JUa+_gSBD56&w&97LU$ib;)4O<}^?@{~meTDTmCpaqE~lIi8;<>7wU z3o_?CBvpqPLVXN}ryYctTc%~Vp)Gog+blbt4aFgM7UC_G#~F~PuYtXU_-3U~pq(ld zo~n$~EI1a}c%2w761Q3Qg6yU>+d7`5D*6&!1MAwbM$0Jugi95V1 zz?7=ZWJ{dxFL>_o0axp$H{c%VgD9_BDCmYMUroP<*g{QOa%4)Jc-I)==Y};~;|$J? zto~E{sln_Jc^z&^b)6AgAeOfx?@_qevKJ$MWXPy1g6-6J9B4hDh){kpO;tP}FwBO% zV@Qm;Srk#c$h3V26yodQqDI%BLBJ72eH7|90A3@2u?dCihyu8X<$}{@fc9qLe3uqP z8<;=jmgAvd@7|Gq7ZiOIW=8$FU0=_SXE84!%Vl>*Z!@n{|Xh_KU z*IHAzlYib_P9;nMZIm6lHV(Z~@7 zziIFafPfklvEcR$Pf_T(5k-_GW_}lb8Fv)z0>Jvbq3Rp7f{2mGE{n*?(-b4jS&=sL zq}^;{F;%8vtXPQ5Ro6H?x8QnwltvjIv^g|GeHK^t(%Zag(+n9o1){*z-|z*i7p zlPj1|qoB{#FB~a2_bVZZLI{=I`(bjPWTgG--yk{V2UI|~x$`OneO5!4&V;K`_hG@c zbh{);3yZ?6`T!xwXOp$k&|h~SLtR15r6V!et%^|DR)xY*fHWEEk@pE2@2?!MpK2wn zEnb>@b~V%zh+1^r-!&NZ_8$8xG2uAZvDrK4PSl^EvZlB7s4`#7&(9m=9#~idhLgj& z;*8Pnn#|VLR*kIZ8RCXSK#lzNTwZh|D~o*Cktc8gMtACh$Id9`=H@1T&K0S|O;oWG zK@O_`2^Bu14J3K{-}j-T!se@6M5M|bu8sTX4RKaPW-yW&CCyQccww%TI4@M$FxYAk zV6H66l3V*tP_iP%x-W?ch!w!)DKRHCjo;ea7&&ZMNs-ntoY^Z|wkA;!o4e<`$4vB6IDK3MZMo^vkN1Vzt=8_}t1+SIH0-0?zD zX6L0{G*x#5w{t3DUdW4F`dfnj%B`PhOTls_VzE_Pc6I-$`d6=_epLA=^O2YF@zOz? zYmhKmV}^DbYHp53-m%!FEE?9A8w27x(}AR9N`r1XzYU%qn&yP6vqYN0xAK*1nVTtEjFx+vkrzsoq(OtPnJjtMJeYa*7DG!CmD`d$KgktI`9AuDdb1ahhjLKFp}?kYEhjic z**KVYB1B=gC6Yp&(L1D*#()rfo>1*q85~w>uXT5MWsA$IKZEiM1`g%@vX?T;SPja` z+nIj(DhR5HjKtdiY|;b}GCndN-$yS-ib?Ntz_{|>kTzLJD5IonRMFQN%0Vk8KNs7S zDecjYg7>F%9ImyHe^a4Zqmxy#qw1*iL5OWJcfO&aA*ec}x<4U4-XZ^b%}s73E7|*s zb#6xlSa>e44sCev?d?7NSWL|HYb+D~5K{XSl9C34F&u1}uR{fxEJ6fT`4J6dk&*P? zD2K&Vf~Kt0yErLft7^_!c|htRA#qPkf4(nICQw308aMRNsDtp9IH~h&SPi9#cK~J? zlHN$15yWGQsZZPdw<Dug_5N#hKo!TZ3v` zpRp%YbFv<5_aK#fI|TZZG2==t&5Q$QKe&tlQNrBREP%c*b$%%&M&fD|J^yCCU89z& zrqMcJ{K!kimOsUZWWv|c?`f{3KSAjKRGz+)S!pYn%MZ6do%mQ@3zWla4}SM!_wbAV E1&Z7|p#T5?