From b128f3bddf56ecea992df152a5322e53ba8131cb Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Tue, 15 Feb 2022 03:45:19 +0000 Subject: [PATCH 1/4] Removes unnecessary pressure regulators. Connects all atmospherics devices & fills in missing pipe segments. --- maps/sccv_horizon/placeholder-1_deck_1.dmm | 45 +++++++++------------- maps/sccv_horizon/placeholder-2_deck_2.dmm | 26 ++++--------- maps/sccv_horizon/placeholder-3_deck_3.dmm | 18 +++++---- 3 files changed, 35 insertions(+), 54 deletions(-) diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index cfde7d5c2f8..0080dfb2f46 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -568,12 +568,10 @@ /turf/simulated/floor/tiled, /area/janitor) "aDv" = ( -/obj/machinery/atmospherics/binary/passive_gate/supply, -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/red, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/operations) "aEl" = ( @@ -2461,14 +2459,14 @@ /turf/space/dynamic, /area/template_noop) "cnV" = ( -/obj/machinery/atmospherics/binary/passive_gate/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/industrial/outline/red, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "coo" = ( @@ -10354,11 +10352,8 @@ /area/outpost/mining_main/refinery) "jpU" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/binary/passive_gate{ - dir = 4; - name = "shuttle airlock pressure regulator"; - target_pressure = 75; - unlocked = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) @@ -15870,12 +15865,10 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "owP" = ( -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/binary/passive_gate/supply, /obj/effect/floor_decal/industrial/outline/red, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/operations) "owZ" = ( @@ -17137,13 +17130,13 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "pMq" = ( -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/binary/passive_gate/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "pMA" = ( @@ -18284,16 +18277,14 @@ /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/air) "qKo" = ( -/obj/machinery/atmospherics/binary/passive_gate/supply, -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/red, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) "qMM" = ( diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index 91968bd48db..020c7ba991c 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -8405,6 +8405,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/armory) "ftS" = ( @@ -9195,8 +9196,6 @@ /area/turret_protected/ai_upload_foyer) "fTo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, @@ -10720,12 +10719,6 @@ /turf/simulated/floor/plating, /area/engineering/storage_hard) "gOi" = ( -/obj/machinery/atmospherics/binary/passive_gate/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) @@ -13878,9 +13871,6 @@ /obj/item/clothing/gloves/latex/nitrile/tajara, /obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc/low{ dir = 4; name = "east bump"; @@ -19700,8 +19690,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ req_access = list(45) }, @@ -22082,6 +22070,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sleep/cryo/living_quarters_lift) "obn" = ( @@ -23048,8 +23039,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ req_access = list(45) }, @@ -36801,6 +36790,7 @@ network = list("Armory"); pixel_x = 30 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/warden) "wRk" = ( @@ -37650,11 +37640,9 @@ "xsY" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/binary/passive_gate/scrubbers, -/obj/machinery/atmospherics/binary/passive_gate/supply{ - dir = 1 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/wing/port) "xtu" = ( diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index 7db165c2ec6..d50f505c4ac 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -11518,13 +11518,13 @@ /turf/simulated/floor/tiled, /area/bridge) "BS" = ( -/obj/machinery/atmospherics/binary/passive_gate/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/binary/passive_gate/supply{ +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor, /area/maintenance/bridge) "BU" = ( @@ -13129,6 +13129,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/bridge) "Gx" = ( @@ -13494,6 +13495,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Ht" = ( @@ -14381,6 +14383,9 @@ name = "Port Docking Hatch"; req_access = list(13) }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/security_starboard) "Jt" = ( @@ -17000,9 +17005,6 @@ /area/bridge) "PH" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/photocopier/faxmachine{ anchored = 0; department = "Representative's Office"; From b59da251c1d86d4abf018a376bff40a0f80b9959 Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Wed, 16 Feb 2022 19:54:45 +0000 Subject: [PATCH 2/4] Removes / remaps some redundant vents + scrubbers. --- maps/sccv_horizon/placeholder-1_deck_1.dmm | 420 +++++++------------ maps/sccv_horizon/placeholder-2_deck_2.dmm | 453 ++++++++------------- maps/sccv_horizon/placeholder-3_deck_3.dmm | 346 ++++------------ 3 files changed, 405 insertions(+), 814 deletions(-) diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index 0080dfb2f46..c37f4a2f002 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -438,7 +438,6 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/atmos/propulsion/starboard) "awQ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/brown{ dir = 4 }, @@ -470,12 +469,6 @@ /area/shuttle/intrepid) "azl" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 10 }, @@ -486,6 +479,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "aAk" = ( @@ -1509,9 +1505,6 @@ /turf/simulated/floor/tiled, /area/shuttle/intrepid) "brT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light/small, /turf/simulated/floor/tiled, /area/operations/storage) @@ -1612,6 +1605,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "bzh" = ( @@ -1768,9 +1763,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -1780,6 +1772,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/loading) "bEJ" = ( @@ -1960,8 +1955,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 @@ -2216,12 +2209,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/steel, /turf/simulated/floor/tiled{ @@ -2625,8 +2612,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/plating, /area/hallway/primary/aft) @@ -2660,14 +2645,16 @@ /turf/simulated/floor/plating, /area/hallway/engineering) "cwa" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/table/steel, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 +/obj/random/tech_supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/area/medical/morgue/lower) +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion/starboard) "cwc" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -3486,11 +3473,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "diR" = ( @@ -4040,12 +4026,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ req_access = list(54); @@ -4911,11 +4891,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/corner/brown, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "eBw" = ( @@ -5368,12 +5350,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/structure/bed/stool/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "eTW" = ( @@ -6112,13 +6096,6 @@ /obj/machinery/door/window/eastleft, /turf/simulated/floor/plating, /area/maintenance/hangar/port) -"fxy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) "fxC" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -7118,9 +7095,6 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "goO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -7328,14 +7302,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/intrepid) -"gxj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) "gxl" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -7366,8 +7332,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) @@ -7970,12 +7934,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -8194,7 +8152,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/floor_decal/corner/brown{ dir = 8 }, @@ -8202,6 +8159,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) "hkb" = ( @@ -9281,13 +9241,13 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "ikF" = ( @@ -9451,15 +9411,14 @@ /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) "itD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/area/medical/morgue/lower) +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "itT" = ( /obj/effect/shuttle_landmark/skipjack_ship/first_deck, /turf/template_noop, @@ -9516,12 +9475,15 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "iyV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/black{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "izN" = ( @@ -10995,12 +10957,6 @@ /obj/structure/cable{ icon_state = "12-0" }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, /obj/structure/railing/mapped, /obj/structure/railing/mapped{ dir = 4 @@ -11156,6 +11112,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "kcL" = ( @@ -11841,9 +11799,11 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "kIz" = ( @@ -11981,17 +11941,6 @@ }, /turf/simulated/floor/tiled, /area/operations/storage) -"kOX" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/outpost/mining_main/refinery) "kQI" = ( /obj/structure/cable{ icon_state = "2-4" @@ -12077,9 +12026,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "kTJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/floor_decal/corner/brown{ dir = 8 }, @@ -12804,6 +12750,9 @@ output_tag = "starboard_prop_out"; sensors = list("starboard_prop_sensor" = "Starboard Reaction Chamber") }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "lGb" = ( @@ -13660,11 +13609,11 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -13860,9 +13809,14 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "mDd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/operations/loading) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "mDt" = ( /turf/simulated/wall, /area/maintenance/substation/research_sublevel) @@ -14438,7 +14392,6 @@ /turf/simulated/floor/tiled, /area/maintenance/operations) "nag" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -14564,7 +14517,6 @@ /turf/simulated/floor/plating, /area/hangar/auxiliary) "ngD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -15262,14 +15214,19 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) "nOM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 +/obj/structure/railing/mapped, +/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ + dir = 8 }, -/area/medical/morgue/lower) +/obj/machinery/atmospherics/pipe/cap/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "nPa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -15423,12 +15380,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "nVb" = ( @@ -15801,8 +15758,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "2-4" @@ -16057,12 +16012,6 @@ "oFx" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "oFy" = ( @@ -16974,9 +16923,21 @@ /area/hangar/intrepid) "pFg" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plating, /area/hallway/primary/aft) "pFK" = ( @@ -17112,14 +17073,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_a) "pLU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/operations) "pMo" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17599,14 +17559,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plating, /area/hangar/intrepid) "qgn" = ( @@ -17760,9 +17714,6 @@ /turf/simulated/floor/plating, /area/operations/lower/machinist) "qnt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/black/full, /turf/simulated/floor/tiled, /area/hallway/primary/aft) @@ -18181,12 +18132,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -18417,12 +18362,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/floor_decal/corner/brown{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "qQF" = ( @@ -18714,8 +18659,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/black{ dir = 4 }, @@ -18853,14 +18796,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "rjr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/eva) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/wing/port/deck1) "rjz" = ( /obj/structure/cable{ icon_state = "2-4" @@ -19183,12 +19124,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/aft) @@ -19407,6 +19342,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/engineering) "rNH" = ( @@ -19931,18 +19867,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "slH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/floor_decal/corner/black{ dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "snA" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19956,6 +19886,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "snD" = ( @@ -20575,8 +20507,6 @@ req_access = list(54); req_one_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/operations) @@ -20700,7 +20630,6 @@ /turf/simulated/floor/tiled, /area/operations/storage) "sWB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/firealarm/north, /obj/effect/floor_decal/corner/black/full{ dir = 1 @@ -21207,11 +21136,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "twX" = ( @@ -21899,16 +21832,16 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "ucG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "udC" = ( @@ -22572,12 +22505,6 @@ /area/rnd/xenoarch_atrium) "uIN" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, @@ -23097,12 +23024,12 @@ /turf/simulated/floor/plating, /area/hangar/control) "vhY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/black{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "vif" = ( @@ -23282,15 +23209,6 @@ "vpB" = ( /turf/simulated/floor/grass/alt, /area/maintenance/hangar/port) -"vpX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/eva) "vqx" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/railing/mapped{ @@ -23419,12 +23337,6 @@ icon_state = "4-8" }, /obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "vuB" = ( @@ -23981,9 +23893,6 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "waN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "wbg" = ( @@ -24741,12 +24650,6 @@ icon_state = "0-8" }, /obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "wNS" = ( @@ -25322,12 +25225,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/light/small{ dir = 4 }, @@ -25740,18 +25637,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) -"xAI" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled{ - name = "cooled floor"; - temperature = 278 - }, -/area/medical/morgue/lower) "xBw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25950,10 +25835,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/loading) "xKI" = ( @@ -26147,7 +26034,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/black{ dir = 6 }, @@ -26337,10 +26223,6 @@ /obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/test_range) -"xXV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/operations/storage) "xXW" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -37821,7 +37703,7 @@ pfs qWW qWW qQE -xXV +nCV kTJ fja dKM @@ -40044,7 +39926,7 @@ feY gvZ rpj nag -mDd +cpf xKE lNi qUK @@ -41443,8 +41325,8 @@ mMR lIg grm sfj -xAI -itD +sfj +sfj xll lIg joW @@ -41645,13 +41527,13 @@ vqW lIg jdm rNH -nOM +rNH cuA lIg lIg nnw nnw -pnf +pLU lEQ nnw vul @@ -41847,7 +41729,7 @@ vqW lIg sRe rNH -cwa +rNH cuA lIg cqu @@ -42462,7 +42344,7 @@ nnw dWL mKj sRd -kOX +oFx teA tYS bKP @@ -43277,8 +43159,8 @@ umB tfh hII qvl -vpX -rjr +qvl +qvl lyo oOk sFA @@ -43642,7 +43524,7 @@ xQU vUo sfF awJ -aZd +cwa lFS aZd awJ @@ -46488,7 +46370,7 @@ wXF bBD fvq ygx -pLU +ygx hDI uUZ ygx @@ -46690,7 +46572,7 @@ kzs kzs kzs kzs -pFg +kzs kzs phs nMJ @@ -46889,11 +46771,11 @@ eNU iFd jCK sWB -fxy -xQI -fxy slH -gxj +xQI +slH +slH +slH rco ctX rwY @@ -47299,7 +47181,7 @@ rHK jBx tny fgF -wLL +pFg iyV fUG wRE @@ -49705,7 +49587,7 @@ uVL pSk sRM lSx -cWX +itD uVL njH boY @@ -50109,7 +49991,7 @@ uVL bLu mDH nrY -cWX +mDd uVL lUr aom @@ -54770,7 +54652,7 @@ eSV eSV eSV rsL -exw +nOM erL erL erL @@ -55196,7 +55078,7 @@ guN qcr xtK aOv -qBU +rjr xfH lPW syN diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index 020c7ba991c..a3bf6073cd6 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -1776,9 +1776,6 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "aXX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/brown{ dir = 9 }, @@ -2148,9 +2145,6 @@ /area/library) "bjM" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/firealarm/east, /obj/machinery/light{ dir = 4 @@ -3504,7 +3498,6 @@ /area/rnd/conference) "ccS" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -3939,12 +3932,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/brig) "cww" = ( @@ -4154,12 +4145,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) -"cCM" = ( -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) "cDD" = ( /obj/structure/table/standard, /obj/machinery/light{ @@ -4735,12 +4720,12 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "cZa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/security/prison) "cZc" = ( @@ -4851,14 +4836,9 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "dcT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, -/area/rnd/hallway) +/area/maintenance/wing/starboard/far) "dcX" = ( /obj/machinery/power/apc{ dir = 1; @@ -5112,9 +5092,9 @@ /turf/simulated/wall/r_wall, /area/security/security_office) "dkq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/security/prison) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/starboard/far) "dkr" = ( /obj/machinery/door/window/brigdoor/northright{ dir = 2; @@ -5167,16 +5147,18 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/operations/office) "dlR" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/structure/disposalpipe/junction{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled, @@ -5212,9 +5194,13 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "dnJ" = ( @@ -5234,12 +5220,6 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -5250,6 +5230,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/operations/lobby) "dnZ" = ( @@ -5835,6 +5817,12 @@ dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "dKB" = ( @@ -6029,8 +6017,6 @@ /turf/simulated/floor/tiled, /area/security/brig/processing) "dRk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/green{ dir = 9 }, @@ -6040,6 +6026,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "dRJ" = ( @@ -6076,11 +6063,9 @@ /turf/simulated/floor/tiled, /area/engineering/smes) "dSH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/port/far) "dSI" = ( /turf/simulated/open, /area/maintenance/wing/port) @@ -6088,10 +6073,9 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/substation/engineering) "dTc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/stool/padded/red, -/turf/simulated/floor/tiled, -/area/security/prison) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/maintenance/wing/port/far) "dTj" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(12) @@ -6109,8 +6093,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/security/prison) @@ -6850,9 +6834,6 @@ /turf/simulated/floor/grass/alt, /area/hydroponics) "ewb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -6916,20 +6897,15 @@ "exx" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "exC" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/far) "exU" = ( /obj/structure/table/stone/marble, /obj/machinery/door/window/westright{ @@ -7743,11 +7719,12 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/port) "eZo" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/prison) +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/far) "eZp" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ @@ -7848,13 +7825,13 @@ /area/crew_quarters/bar) "faO" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "fcF" = ( @@ -8119,6 +8096,12 @@ }, /obj/random/junk, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "fkF" = ( @@ -9170,12 +9153,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "fSK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/spline/plain/corner, /obj/structure/cable/green{ icon_state = "2-4" @@ -9487,7 +9464,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9498,6 +9474,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/storage) "gdW" = ( @@ -9956,9 +9935,6 @@ /turf/simulated/floor/wood, /area/library) "grd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -9969,6 +9945,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/operations/office) "grL" = ( @@ -10438,9 +10418,6 @@ /turf/simulated/floor/tiled, /area/security/brig) "gEa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, @@ -11429,13 +11406,13 @@ /area/maintenance/hangar/port) "hne" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "hnf" = ( @@ -12831,14 +12808,15 @@ /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "ihG" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/far) "iic" = ( /obj/structure/table/reinforced{ table_mat = "steel"; @@ -13328,7 +13306,6 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "iDj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/brown{ dir = 6 }, @@ -13843,9 +13820,6 @@ /turf/simulated/floor/tiled, /area/operations/mail_room) "iQK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -13853,6 +13827,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/prison) "iRb" = ( @@ -14568,7 +14545,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/prison) "jmE" = ( @@ -15995,11 +15971,15 @@ /turf/simulated/floor/reinforced, /area/template_noop) "kgK" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port/far) "kgS" = ( /obj/structure/bed/stool/padded/red, /obj/machinery/camera/network/service{ @@ -16219,15 +16199,15 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "ksL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "kta" = ( @@ -17104,9 +17084,6 @@ /turf/simulated/floor/plating, /area/operations/storage) "kXU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -17827,7 +17804,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "lzI" = ( @@ -18144,19 +18123,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/chapel/office) -"lIk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) "lIz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -18209,15 +18175,9 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -19803,13 +19763,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research) "mHa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mHh" = ( @@ -19919,8 +19881,6 @@ /turf/template_noop, /area/template_noop) "mLk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/green{ dir = 6 }, @@ -20417,13 +20377,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mYK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mYL" = ( @@ -20870,8 +20832,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "nks" = ( @@ -20984,8 +20944,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/corner/mauve/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "nnt" = ( @@ -22910,16 +22872,10 @@ icon_state = "11-8" }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/maintenance/hangar/port) "oBZ" = ( /obj/structure/cable/green{ @@ -23222,7 +23178,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 8 }, @@ -24267,8 +24222,6 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "pvS" = ( @@ -25156,9 +25109,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -25612,12 +25562,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25626,6 +25570,8 @@ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "qnE" = ( @@ -26778,15 +26724,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/engineering) -"qYU" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) "qZb" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/industrial/outline/yellow, @@ -26827,9 +26764,6 @@ /turf/simulated/floor/tiled/dark, /area/hallway/engineering) "qZI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, @@ -27685,12 +27619,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) @@ -28370,10 +28298,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/corner/mauve/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "rSG" = ( @@ -28501,11 +28429,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/conference) "rVV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) +/turf/simulated/floor/plating, +/area/maintenance/wing/port/far) "rWp" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-2" @@ -29757,10 +29686,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "sQv" = ( @@ -31361,14 +31286,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "tOE" = ( -/obj/effect/floor_decal/corner_wide/lime{ - dir = 6 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/turf/simulated/floor/plating, +/area/maintenance/wing/port/far) "tOS" = ( /obj/machinery/light{ dir = 1 @@ -31825,6 +31748,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/operations/office) "udw" = ( @@ -32797,8 +32723,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) @@ -33591,8 +33517,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vfi" = ( @@ -33699,12 +33629,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/engineering) "vhU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/floor_decal/corner/green{ dir = 6 }, @@ -34103,14 +34027,16 @@ /turf/simulated/floor/tiled, /area/operations/mail_room) "vxh" = ( -/obj/effect/floor_decal/corner/green{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/brown{ dir = 9 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/operations/storage) "vxK" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sink/kitchen{ @@ -37094,14 +37020,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "xbY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/brig) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/port) "xcp" = ( /obj/machinery/alarm{ dir = 8; @@ -37147,9 +37071,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "xdl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -37497,10 +37418,6 @@ /turf/template_noop, /area/template_noop) "xoj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain, /obj/structure/cable/green{ icon_state = "4-8" @@ -37991,12 +37908,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "xGW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 8 }, @@ -38039,7 +37950,6 @@ /area/security/warden) "xIo" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" @@ -38716,7 +38626,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "ybp" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/mauve{ dir = 5 }, @@ -38899,12 +38808,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "yeF" = ( @@ -43680,8 +43589,8 @@ dEz nox exw nox -nox -uOq +dcT +exC nox exw nox @@ -43883,7 +43792,7 @@ ubt uOq uOq uOq -uOq +eZo uOq uOq uOq @@ -44085,7 +43994,7 @@ ubt uOq uOq uOq -uOq +eZo uOq uOq uOq @@ -44287,7 +44196,7 @@ ubt uOq uOq uOq -uOq +eZo uOq uOq uOq @@ -44488,8 +44397,8 @@ dEz nox atB nox -nox -uOq +dkq +ihG nox atB nox @@ -51364,7 +51273,7 @@ tae gwv gwv gwv -oaz +vxh qSE tae tae @@ -51790,7 +51699,7 @@ jWV jWV jWV jWV -dSH +gOH aFJ wFj wFj @@ -52194,7 +52103,7 @@ dsj nLC nkM bCv -ihG +gOH aFJ udR xer @@ -52396,7 +52305,7 @@ ijD uNl win bCv -ghX +gOH aFJ udR xer @@ -52598,7 +52507,7 @@ jWV swi bCv bCv -ghX +gOH aQb udR xer @@ -53793,10 +53702,10 @@ nTp cUA vOZ cOn -vxh +cDV dgy bdj -rVV +gOH gOH ohQ fqr @@ -53993,15 +53902,15 @@ qwJ mIO xzM rEK -cCM +exx xIo exx nkd pvy sQj -qYU +sQj lKD -lDb +fqr jNk jNk jNk @@ -54402,7 +54311,7 @@ snt hOU hOU ygw -lIk +xoj cfz pjL mfA @@ -54603,7 +54512,7 @@ cLV kaR hzY hOU -nmG +dKH xoj pyc nEx @@ -54806,7 +54715,7 @@ uHN cWG snt dKH -lIk +xoj luT vMH mfA @@ -55819,7 +55728,7 @@ tqF wEc dKH ksL -lDb +fqr gJj pSP pSP @@ -56221,7 +56130,7 @@ uyb djj aYf seZ -nmG +dKH mYK fqr gJj @@ -57225,10 +57134,10 @@ oBZ pMB lMm faO -kgK -kgK +ufG +ufG ccS -exC +ufG ufG wdw iBw @@ -57629,7 +57538,7 @@ pDx iIf ycV yej -tOE +dvI dvI nOu fOp @@ -61688,7 +61597,7 @@ hUC hUC hUC dnn -lAI +xbY rxb dvw wiz @@ -63095,7 +63004,7 @@ gDT fOn fPP vMF -xbY +fPP fPP haI fPP @@ -65522,11 +65431,11 @@ bHb wFe ePb cZa -dkq -dTc -dTc +pJE +pBA +pBA jmp -dkq +pJE gEa pSv pSv @@ -65925,7 +65834,7 @@ aac joH aac dVc -eZo +pJE pJE hpC gof @@ -67920,7 +67829,7 @@ xqe rFn tPq rSx -dcT +rnA bSD gXD ouk @@ -74182,8 +74091,8 @@ fuu ueH jAo ueH -ueH -lBd +dSH +kgK jAo ueH ueH @@ -74385,7 +74294,7 @@ eFS lBd lBd lBd -lBd +rVV lBd lBd lBd @@ -74587,7 +74496,7 @@ eFS lBd lBd lBd -lBd +rVV lBd lBd lBd @@ -74789,7 +74698,7 @@ eFS lBd lBd lBd -lBd +rVV lBd lBd lBd @@ -74990,8 +74899,8 @@ fuu ueH afe ueH -ueH -lBd +dTc +tOE ueH afe ueH diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index d50f505c4ac..1719e925056 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -1134,13 +1134,6 @@ /obj/item/device/camera, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) -"cz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner_wide/blue, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) "cA" = ( /obj/machinery/alarm{ dir = 4; @@ -1348,7 +1341,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "cV" = ( @@ -2546,8 +2538,12 @@ /turf/simulated/floor, /area/maintenance/bridge) "fI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "fJ" = ( @@ -2698,9 +2694,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "gd" = ( @@ -2770,8 +2764,8 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) @@ -3355,11 +3349,11 @@ name = "Security - Investigations Office" }) "hK" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) @@ -3452,9 +3446,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck - Emergency Service Dock"; dir = 1 @@ -3528,9 +3519,6 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "ic" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/ringer_button{ id = "investigation_ringer"; pixel_x = 5; @@ -3604,9 +3592,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "il" = ( @@ -3694,9 +3679,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "iu" = ( @@ -3832,9 +3814,6 @@ dir = 4 }, /obj/structure/flora/pottedplant/random, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "iK" = ( @@ -4035,9 +4014,6 @@ /area/security/forensics_office) "jn" = ( /obj/effect/floor_decal/corner_wide/blue, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "jo" = ( @@ -4095,9 +4071,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "jx" = ( @@ -4463,14 +4436,14 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "kp" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) +/area/hallway/primary/starboard) "kr" = ( /obj/structure/bed/stool/chair/plastic{ dir = 8 @@ -5024,14 +4997,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/investigations) "lQ" = ( @@ -5146,18 +5117,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) -"mb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/crew_area) "md" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/crew_quarters/captain) @@ -6128,12 +6087,14 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "op" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 9 +/obj/effect/floor_decal/corner/paleblue{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) +/area/hallway/primary/starboard) "oq" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -7106,12 +7067,12 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "qC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/obj/effect/floor_decal/corner/paleblue, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/hallway/crew_area) "qD" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -7405,14 +7366,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/hallway/secondary/entry/emergency) +/area/hallway/crew_area) "rl" = ( /turf/simulated/wall, /area/maintenance/security_starboard) @@ -7452,7 +7410,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "rq" = ( @@ -7737,23 +7694,11 @@ dir = 1 }, /obj/machinery/disposal/small/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) -"sb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "sc" = ( /obj/machinery/light_switch{ pixel_x = -14; @@ -7901,15 +7846,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/command) -"st" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "su" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -8129,7 +8065,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "sY" = ( @@ -8306,9 +8241,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "tu" = ( @@ -8449,9 +8381,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "tK" = ( @@ -9199,9 +9128,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "vR" = ( @@ -9220,7 +9146,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 32 }, @@ -10051,13 +9976,6 @@ /obj/structure/flora/pottedplant/random, /turf/simulated/floor/carpet, /area/crew_quarters/captain) -"yj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner_wide/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) "yk" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, @@ -10473,9 +10391,6 @@ /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "zo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 8 }, @@ -10626,12 +10541,12 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "zQ" = ( @@ -10793,9 +10708,6 @@ /area/bridge/meeting_room) "Af" = ( /obj/structure/closet/secure_closet/personal, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -10826,12 +10738,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"Ak" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/locker) "Al" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -10866,16 +10772,6 @@ "Ao" = ( /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) -"Ar" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "As" = ( /obj/machinery/door/window/southleft, /obj/effect/floor_decal/corner/blue{ @@ -11299,16 +11195,6 @@ }, /turf/simulated/floor/wood, /area/lawoffice/representative) -"Bq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "Br" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11576,15 +11462,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/third_deck_stairs) -"Ce" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "Cf" = ( /turf/simulated/wall, /area/crew_quarters/sleep/cryo) @@ -11894,9 +11771,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "CZ" = ( @@ -12474,15 +12348,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/hop/xo) -"EL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "EM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12609,16 +12474,6 @@ temperature = 278 }, /area/tcommsat/chamber) -"Ff" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled, -/area/hallway/secondary/entry/emergency) "Fg" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -13069,13 +12924,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"Gq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) "Gr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -13768,9 +13616,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "Id" = ( @@ -14363,9 +14208,6 @@ c_tag = "Third Deck - Holodeck"; dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -14609,6 +14451,9 @@ pixel_x = 28; req_one_access = list(24,11,55) }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "JX" = ( @@ -14817,9 +14662,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "Ku" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -15456,12 +15298,6 @@ }, /turf/simulated/open, /area/hallway/primary/starboard) -"LV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "LY" = ( /obj/structure/railing/mapped{ dir = 1 @@ -16625,9 +16461,6 @@ dir = 1; pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -17068,12 +16901,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "PL" = ( @@ -17458,7 +17289,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "QC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, @@ -18220,6 +18050,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "SF" = ( @@ -18797,9 +18628,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Ug" = ( @@ -19247,9 +19075,6 @@ layer = 3.3; pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -19740,13 +19565,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) -"WF" = ( -/obj/structure/bed/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/locker) "WH" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -20676,13 +20494,6 @@ }, /turf/simulated/floor/carpet, /area/lawoffice/consular) -"YX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner_wide/blue{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/fitness/pool) "YY" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -20952,9 +20763,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -20963,6 +20771,7 @@ dir = 4; pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/investigations) "ZB" = ( @@ -20995,15 +20804,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) -"ZF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "ZG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -31773,7 +31573,7 @@ at at eb pm -mb +Ku GQ at at @@ -31975,7 +31775,7 @@ at at eb WL -mb +Ku GQ at at @@ -32177,7 +31977,7 @@ at at eb pm -mb +Ku GQ Qw at @@ -32580,8 +32380,8 @@ at at at GQ -WL -mb +qC +rk eb eb eb @@ -36576,7 +36376,7 @@ at at QY cU -hK +Ql kz Ql Ql @@ -36584,7 +36384,7 @@ tz Ql Ql Ql -gm +Ql tt Um Zl @@ -36792,7 +36592,7 @@ Um nZ DW Ny -Ak +Ny Ny Ec TI @@ -36994,7 +36794,7 @@ Iq Ny DW yz -WF +yz yz Ec Da @@ -37799,7 +37599,7 @@ wh Ic Eq nL -Ql +gm Ql Ql RU @@ -37990,8 +37790,8 @@ at at Ky ez -kp -op +Eq +Ql rp sX sX @@ -37999,9 +37799,9 @@ vQ Ql Ql it -Gq -zj -zj +kW +kW +hK zj zj zj @@ -38014,7 +37814,7 @@ xd iR Wq sC -Bq +Zz Zz gc fH @@ -38199,9 +37999,9 @@ ta un ik vT -YX -yj -cz +AS +CX +jn AS JW AS @@ -38216,9 +38016,9 @@ cD Jg gl ut -Dy uk -st +uk +ve Hh Hh Hh @@ -38418,7 +38218,7 @@ xs xs RT Su -Ar +zq zq tJ ge @@ -38620,9 +38420,9 @@ Ye xs YO Ko -Ce RJ -EL +RJ +RJ Hh uC ss @@ -42472,7 +42272,7 @@ vY vY cV Ou -sb +Ji co Ou Uq @@ -42676,7 +42476,7 @@ cV Ou zo Oz -vb +kp Uq CN nu @@ -42876,8 +42676,8 @@ UV UV cV Ou -hY -LV +uk +uL fI kX Dm @@ -43078,9 +42878,9 @@ WD WD GE Ou -qC +WN QA -eP +op Uq CN ra @@ -43280,7 +43080,7 @@ UV UV cV Ou -ZF +Ji co Ou Uq @@ -47716,7 +47516,7 @@ IR Yc KE Wx -Ff +IY rl Lo Fo @@ -48524,7 +48324,7 @@ at at Cu kI -rk +Aa rl Lo Fj From 2e51f9b5ce8d4f72370009a487920ed083b732a2 Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Wed, 16 Feb 2022 21:32:13 +0000 Subject: [PATCH 3/4] Maps 3 Aux Atmospherics rooms into maintenance. --- maps/sccv_horizon/code/sccv_horizon_areas.dm | 7 + maps/sccv_horizon/placeholder-1_deck_1.dmm | 276 ++--- maps/sccv_horizon/placeholder-2_deck_2.dmm | 1130 +++++++++++------- maps/sccv_horizon/placeholder-3_deck_3.dmm | 771 ++++++++---- 4 files changed, 1383 insertions(+), 801 deletions(-) diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 112387d1fa5..390c83f49a3 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -275,6 +275,13 @@ name = "Operations Maintenance" icon_state = "maint_cargo" +/area/maintenance/aux_atmospherics/deck_2/starboard + name = "Starboard Auxiliary Atmospherics" +/area/maintenance/aux_atmospherics/deck_2/starboard/wing + name = "Starboard Wing Auxiliary Atmospherics" +/area/maintenance/aux_atmospherics/deck_3 + name = "Central Auxiliary Atmospherics" + // Infrastructure /area/storage/shields diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index c37f4a2f002..9fbb2171bac 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -81,12 +81,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) @@ -1032,15 +1026,15 @@ /obj/structure/cable/green{ icon_state = "12-0" }, +/obj/structure/railing/mapped{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "aYt" = ( @@ -2282,12 +2276,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Operations Bay Warehouse Maintenance"; @@ -2504,21 +2492,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) -"cqa" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/storage) "cqd" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, @@ -2724,13 +2697,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "cBF" = ( @@ -3616,12 +3585,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency{ dir = 1 @@ -3690,12 +3653,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/tiled, /area/operations/storage) @@ -3961,17 +3918,14 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "dKM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/storage) +/turf/simulated/floor/tiled/dark, +/area/engineering/atmos/propulsion) "dKS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5806,15 +5760,15 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/operations/storage) "fja" = ( @@ -9414,8 +9368,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) @@ -10810,13 +10764,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/lattice/catwalk/indoor/grate/damaged, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate/damaged, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "jKc" = ( @@ -13809,14 +13763,19 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "mDd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/lattice/catwalk/indoor, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/railing/mapped, +/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/engineering/atmos/propulsion) +/obj/machinery/atmospherics/pipe/cap/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "mDt" = ( /turf/simulated/wall, /area/maintenance/substation/research_sublevel) @@ -15214,19 +15173,24 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) "nOM" = ( -/obj/structure/lattice/catwalk/indoor, +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/cap/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/research_port) +/area/hallway/primary/aft) "nPa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -15380,12 +15344,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/operations/storage) "nVb" = ( @@ -16465,12 +16423,6 @@ /obj/structure/cable{ icon_state = "12-0" }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, @@ -16922,24 +16874,13 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "pFg" = ( -/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/hallway/primary/aft) +/area/maintenance/operations) "pFK" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -17073,13 +17014,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_a) "pLU" = ( -/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/wing/port/deck1) "pMo" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -18531,12 +18471,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled, /area/operations/storage) @@ -18799,7 +18733,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/damaged, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "rjz" = ( @@ -23209,6 +23143,19 @@ "vpB" = ( /turf/simulated/floor/grass/alt, /area/maintenance/hangar/port) +"vpX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port/deck1) "vqx" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/railing/mapped{ @@ -24320,13 +24267,13 @@ icon_state = "4-8" }, /obj/machinery/light/small/emergency, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "wsD" = ( @@ -25280,12 +25227,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 1 }, @@ -25293,6 +25234,12 @@ dir = 8 }, /obj/effect/decal/cleanable/vomit, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "xmg" = ( @@ -25311,12 +25258,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) @@ -25637,6 +25578,19 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) +"xAI" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port/deck1) "xBw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25756,12 +25710,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 1 }, @@ -25769,6 +25717,12 @@ dir = 4 }, /obj/random/loot, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "xGW" = ( @@ -34675,8 +34629,8 @@ hoV eSV eSV noz -qBU -nAS +pLU +vpX hTk hoV eSV @@ -34877,8 +34831,8 @@ hoV eSV eSV noz -qBU -nAS +pLU +vpX hTk hoV eSV @@ -35079,8 +35033,8 @@ hoV eSV eSV hTk -ezh -nAS +rjr +vpX hTk hTk eSV @@ -35281,7 +35235,7 @@ hoV eSV eSV hTk -qBU +pLU xmf noz eSV @@ -35483,7 +35437,7 @@ hoV eSV eSV hTk -qBU +pLU xGF noz eSV @@ -35685,8 +35639,8 @@ hTk kVe kVe hTk -qBU -nAS +pLU +vpX hTk hTk eSV @@ -35887,7 +35841,7 @@ hTk hTk hTk hTk -qBU +pLU jJp hTk hoV @@ -36090,7 +36044,7 @@ gBl gBl lVT cAG -nAS +xAI hTk hoV eSV @@ -36292,7 +36246,7 @@ qdE qdE qdE qdE -nAS +xmV hTk hTk eSV @@ -37302,7 +37256,7 @@ pGs qEK jDU wsD -cqa +nUn uLM qdE wqR @@ -37706,7 +37660,7 @@ qQE nCV kTJ fja -dKM +bqI nCV qdE wqR @@ -41533,7 +41487,7 @@ lIg lIg nnw nnw -pLU +pFg lEQ nnw vul @@ -47181,7 +47135,7 @@ rHK jBx tny fgF -pFg +nOM iyV fUG wRE @@ -49587,7 +49541,7 @@ uVL pSk sRM lSx -itD +dKM uVL njH boY @@ -49991,7 +49945,7 @@ uVL bLu mDH nrY -mDd +itD uVL lUr aom @@ -54652,7 +54606,7 @@ eSV eSV eSV rsL -nOM +mDd erL erL erL @@ -55078,7 +55032,7 @@ guN qcr xtK aOv -rjr +pLU xfH lPW syN diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index a3bf6073cd6..88056d2b6db 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -335,6 +335,16 @@ }, /turf/simulated/floor/wood, /area/library) +"aiP" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + name = "Aux Tanks Inlet" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "ajt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -475,14 +485,22 @@ /area/maintenance/wing/port/far) "and" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "ann" = ( /obj/effect/floor_decal/corner/mauve{ dir = 8 @@ -573,8 +591,12 @@ /obj/structure/cable{ icon_state = "11-2" }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 1 + }, /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/down, /turf/simulated/open, @@ -1210,17 +1232,9 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "aJS" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/area/maintenance/wing/starboard/far) "aKr" = ( /obj/effect/floor_decal/corner/mauve, /turf/simulated/floor/tiled/dark, @@ -1789,13 +1803,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "aYf" = ( /obj/machinery/light, /obj/structure/closet/secure_closet/chemical, @@ -2266,7 +2279,7 @@ icon_state = "medium" }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "boR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -2406,6 +2419,18 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"bsG" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 4; + name = "Aux Tanks Outlet" + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "bsK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -2524,6 +2549,12 @@ "bwR" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "bwU" = ( @@ -2601,6 +2632,10 @@ }, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) +"bzH" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "bzY" = ( /obj/item/modular_computer/console/preset/medical{ dir = 1 @@ -2699,13 +2734,10 @@ /turf/simulated/floor/carpet, /area/chapel/office) "bDd" = ( +/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "bDj" = ( @@ -2741,6 +2773,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/port/far) +"bFA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/port) "bFN" = ( /obj/machinery/power/apc{ dir = 8; @@ -2802,6 +2841,13 @@ /obj/machinery/disposal/small/north, /turf/simulated/floor/tiled/white, /area/rnd/research) +"bGk" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "bGI" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -2906,6 +2952,13 @@ /obj/effect/floor_decal/corner/mauve/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/chemistry) +"bKd" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "bKu" = ( /obj/structure/railing/mapped, /obj/effect/decal/cleanable/dirt, @@ -2985,12 +3038,6 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "bOI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3002,6 +3049,12 @@ icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "bOR" = ( @@ -3054,12 +3107,16 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "bPs" = ( @@ -3343,6 +3400,19 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/conference) +"bYf" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "bYl" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-1" @@ -3676,6 +3746,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "cks" = ( @@ -3845,6 +3918,12 @@ }, /turf/simulated/open, /area/maintenance/wing/starboard) +"cpY" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "cqS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4661,7 +4740,6 @@ "cWx" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) @@ -4699,15 +4777,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "cYy" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, @@ -4836,7 +4914,7 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "dcT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard/far) "dcX" = ( @@ -4913,6 +4991,9 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) +"deL" = ( +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "deY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -5092,9 +5173,9 @@ /turf/simulated/wall/r_wall, /area/security/security_office) "dkq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard/far) +/area/maintenance/wing/port/far) "dkr" = ( /obj/machinery/door/window/brigdoor/northright{ dir = 2; @@ -5314,6 +5395,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/checkpoint2) +"dsl" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "dsw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5542,6 +5636,14 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) +"dAN" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 1; + name = "Aux Tanks Inlet" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "dAX" = ( /obj/structure/cable{ icon_state = "1-4" @@ -6063,7 +6165,7 @@ /turf/simulated/floor/tiled, /area/engineering/smes) "dSH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) "dSI" = ( @@ -6073,9 +6175,12 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/substation/engineering) "dTc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/port/far) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/far) "dTj" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(12) @@ -6247,11 +6352,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/security/main) -"dZB" = ( -/obj/machinery/space_heater, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) "dZG" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -6902,7 +7002,7 @@ "exC" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) @@ -7166,15 +7266,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/wing_port) "eFo" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 8 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/wing/starboard/far) "eFS" = ( /turf/simulated/floor/tiled, /area/maintenance/wing/port/far) @@ -7720,11 +7820,14 @@ /area/maintenance/hangar/port) "eZo" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard/far) +/area/maintenance/wing/port/far) "eZp" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ @@ -7897,6 +8000,9 @@ /obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /turf/simulated/floor/tiled, /area/medical/first_responder) +"fdF" = ( +/turf/simulated/wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "fdZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -7916,12 +8022,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -8473,6 +8573,10 @@ /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) +"fxw" = ( +/obj/random/loot, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "fyi" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8850,12 +8954,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -9325,6 +9423,20 @@ /obj/machinery/chem_master, /turf/simulated/floor/tiled/dark, /area/hydroponics) +"fZz" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/low{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "fZC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -9353,8 +9465,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -9960,6 +10070,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/prison) +"grQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "gsh" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/hologram/holopad, @@ -10117,6 +10234,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) +"gvy" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "gvG" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 1 @@ -10180,6 +10304,13 @@ }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) +"gyu" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "gyC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10578,6 +10709,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lobby) +"gJc" = ( +/obj/structure/shuttle_part/scc_space_ship{ + icon_state = "d3-4-f" + }, +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "gJj" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "chapel_outer" @@ -10894,12 +11031,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "gUB" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "gVq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -11980,15 +12115,18 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "hDd" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 @@ -12125,12 +12263,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, @@ -12150,6 +12282,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"hGX" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "hHB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -12205,12 +12344,12 @@ /turf/simulated/floor/grass/alt, /area/hallway/primary/central_two) "hIT" = ( -/obj/structure/grille, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "hIV" = ( /obj/structure/railing/mapped{ dir = 4 @@ -12238,6 +12377,12 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/white, /area/security/prison) +"hLb" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "hLP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12810,13 +12955,20 @@ "ihG" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard/far) +/area/maintenance/wing/port/far) +"iia" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "iic" = ( /obj/structure/table/reinforced{ table_mat = "steel"; @@ -13050,6 +13202,12 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"ipL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "iqg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13280,8 +13438,14 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "iCx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13356,14 +13520,14 @@ icon_state = "4-8" }, /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk, -/turf/simulated/open, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/maintenance/wing/starboard) "iEd" = ( /obj/machinery/alarm{ @@ -13474,12 +13638,6 @@ /turf/simulated/floor/plating, /area/hallway/engineering) "iHH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -13583,13 +13741,6 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) -"iJp" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) "iJq" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -14426,6 +14577,12 @@ }, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) +"jjO" = ( +/obj/structure/shuttle_part/scc_space_ship{ + icon_state = "d3-6-f" + }, +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "jjW" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 8 @@ -15493,15 +15650,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "jRO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "jSP" = ( @@ -15648,13 +15799,13 @@ icon_state = "11-4" }, /obj/structure/lattice, +/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 4 }, -/obj/structure/lattice/catwalk, /turf/simulated/open, /area/maintenance/wing/starboard) "jWh" = ( @@ -15973,9 +16124,6 @@ "kgK" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/plating, @@ -16021,6 +16169,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) +"kie" = ( +/obj/machinery/atmospherics/valve/digital/open{ + name = "Starboard Main Supply Valve" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "kiJ" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/fire{ @@ -16188,16 +16344,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/operations/office) -"ksF" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 8 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) "ksL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16340,8 +16486,6 @@ /area/engineering/lobby) "kxd" = ( /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, @@ -16377,6 +16521,9 @@ }, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) +"kxP" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "kyA" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/effect/floor_decal/industrial/warning/corner{ @@ -16638,12 +16785,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) @@ -16742,14 +16883,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, @@ -17646,6 +17779,9 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "lrQ" = ( @@ -18170,6 +18306,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/wing_port) +"lJX" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/port) "lKD" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -18382,11 +18525,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) @@ -18615,10 +18758,9 @@ /turf/simulated/wall, /area/maintenance/wing/port) "lVG" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/table/rack, +/obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "lVZ" = ( /obj/machinery/door/airlock{ name = "Brig Showers" @@ -19338,6 +19480,9 @@ /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, /obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "mte" = ( @@ -19431,8 +19576,6 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) @@ -19526,6 +19669,11 @@ }, /turf/simulated/floor/carpet/rubber, /area/crew_quarters/heads/chief) +"mxO" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "mye" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 8 @@ -20413,8 +20561,6 @@ /obj/structure/cable/green{ icon_state = "11-2" }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, /turf/simulated/open, /area/maintenance/wing/starboard) "naD" = ( @@ -21473,6 +21619,12 @@ }, /turf/simulated/floor/plating, /area/hallway/engineering) +"nDK" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "nEx" = ( /obj/structure/railing/mapped, /turf/simulated/open, @@ -21514,14 +21666,13 @@ /turf/simulated/floor/plating, /area/storage/tech) "nFT" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 8; + name = "Aux Tanks Outlet" }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "nGm" = ( /obj/structure/cable{ icon_state = "2-8" @@ -21589,6 +21740,12 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) +"nKg" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "nKt" = ( /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; @@ -22543,6 +22700,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) +"otw" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "ouk" = ( /obj/structure/bed/stool/chair/office/light{ dir = 8 @@ -23310,13 +23474,11 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "oQZ" = ( @@ -23528,6 +23690,10 @@ /obj/structure/bed/stool/padded/red, /turf/simulated/floor/lino/grey, /area/crew_quarters/cafeteria) +"oXy" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "oXY" = ( /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) @@ -23588,6 +23754,15 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room) +"oZx" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "oZB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23631,8 +23806,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "paf" = ( @@ -23725,11 +23898,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armory) -"pdS" = ( -/obj/structure/reagent_dispensers/extinguisher, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) "pea" = ( /turf/simulated/floor/wood, /area/library) @@ -24390,6 +24558,12 @@ /obj/structure/bed/stool/padded/red, /turf/simulated/floor/tiled, /area/security/prison) +"pBB" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "pCf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24406,6 +24580,12 @@ "pDh" = ( /turf/simulated/wall/r_wall, /area/security/main) +"pDn" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "pDx" = ( /obj/machinery/disposal, /obj/effect/floor_decal/corner_wide/green{ @@ -24457,10 +24637,12 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "pEt" = ( -/obj/structure/girder, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "pEu" = ( /turf/simulated/floor/tiled/ramp, /area/turret_protected/ai_upload) @@ -24479,8 +24661,14 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "pER" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -24671,11 +24859,13 @@ /area/maintenance/wing/starboard/far) "pKc" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/emergency{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "pKh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -25096,13 +25286,18 @@ /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) "pWb" = ( -/obj/effect/floor_decal/industrial/warning/cee, -/obj/machinery/door/window/southright, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) + }, /turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "pWj" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25404,12 +25599,6 @@ /turf/template_noop, /area/template_noop) "qhf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -25578,15 +25767,12 @@ /obj/structure/cable{ icon_state = "11-8" }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 8 - }, /obj/structure/lattice, /obj/structure/lattice/catwalk, -/turf/simulated/open, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/maintenance/wing/starboard) "qqs" = ( /obj/structure/coatrack{ @@ -25900,10 +26086,12 @@ /turf/simulated/floor/tiled, /area/security/prison) "qxy" = ( -/turf/simulated/floor/tiled/ramp{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/maintenance/wing/starboard) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "qxK" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/maintenance, @@ -26164,16 +26352,11 @@ /area/medical/pharmacy) "qFW" = ( /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/power/apc/low{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "qFY" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -28124,16 +28307,13 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/item/material/shard{ icon_state = "small" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "rOt" = ( @@ -28273,12 +28453,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -28286,6 +28460,12 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "rSx" = ( @@ -28429,12 +28609,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/conference) "rVV" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/wing/port/far) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/operations/storage) "rWp" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-2" @@ -28505,14 +28689,9 @@ /area/assembly/chargebay) "rYx" = ( /obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/fossil/skull{ - desc = "A wise-looking skull. \"One hundred and thirty two\" is engraved on its forehead."; - name = "wise skull" - }, /obj/random/loot, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "rYM" = ( /obj/effect/floor_decal/corner/paleblue/full, /obj/structure/closet/secure_closet/personal, @@ -28694,6 +28873,12 @@ "seZ" = ( /turf/simulated/wall/r_wall, /area/medical/pharmacy) +"sfk" = ( +/obj/structure/shuttle_part/scc_space_ship{ + icon_state = "d2-2" + }, +/turf/simulated/wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "sfr" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 @@ -28744,7 +28929,7 @@ req_access = list(12) }, /turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/area/maintenance/aux_atmospherics/deck_2/starboard) "shi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29016,6 +29201,9 @@ "sqc" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "sqe" = ( @@ -29269,6 +29457,12 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) +"sBt" = ( +/obj/structure/shuttle_part/scc_space_ship{ + icon_state = "d3-5-f" + }, +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_2/starboard) "sBE" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -30677,12 +30871,13 @@ /turf/simulated/floor/plating, /area/engineering/smes/tesla) "txc" = ( -/obj/structure/grille/broken, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/wing/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "txq" = ( /turf/simulated/wall, /area/crew_quarters/cafeteria) @@ -31135,6 +31330,16 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/research) +"tKo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "tKw" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -31242,6 +31447,12 @@ }, /turf/simulated/floor/plating, /area/storage/tech) +"tND" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "tNS" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -31286,12 +31497,18 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "tOE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/wing/port/far) +/area/maintenance/wing/starboard) "tOS" = ( /obj/machinery/light{ dir = 1 @@ -32392,6 +32609,14 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) +"uuI" = ( +/obj/machinery/atmospherics/valve/digital/open{ + dir = 4; + name = "Starboard Wing Main Supply Valve" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "uuL" = ( /obj/structure/railing/mapped{ dir = 1 @@ -32647,9 +32872,13 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "uEg" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/table/rack, -/obj/random/loot, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "uEl" = ( @@ -32689,6 +32918,13 @@ }, /turf/simulated/floor/wood, /area/chapel/office) +"uEI" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "uFc" = ( /obj/machinery/light{ dir = 1 @@ -32914,6 +33150,11 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "uKB" = ( @@ -33286,6 +33527,17 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/medical/first_responder) +"uVi" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "uXq" = ( /obj/structure/railing/mapped{ dir = 1 @@ -33600,15 +33852,9 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "vhu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) @@ -33763,6 +34009,13 @@ "voz" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/heads/chief) +"voH" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "voX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34027,16 +34280,14 @@ /turf/simulated/floor/tiled, /area/operations/mail_room) "vxh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/ladder{ + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/brown{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/operations/storage) +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "vxK" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sink/kitchen{ @@ -34092,16 +34343,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "vyE" = ( @@ -34252,12 +34500,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "vDq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -34904,6 +35146,11 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room) +"vVv" = ( +/obj/structure/table/rack, +/obj/random/loot, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "vVF" = ( /obj/machinery/conveyor{ dir = 10; @@ -35565,10 +35812,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/conference) "wlJ" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard) +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "wmc" = ( /obj/structure/table/stone/marble, /obj/machinery/door/blast/shutters{ @@ -35622,13 +35870,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/damaged, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate/damaged, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "wnj" = ( @@ -36117,6 +36362,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) +"wCS" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aux_atmospherics/deck_2/starboard) "wCZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -36192,8 +36444,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "wDJ" = ( @@ -36640,6 +36890,19 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) +"wOd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "wOo" = ( /obj/machinery/honey_extractor{ density = 1 @@ -37020,12 +37283,18 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "xbY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/hangar/port) +/area/maintenance/wing/starboard) "xcp" = ( /obj/machinery/alarm{ dir = 8; @@ -37169,6 +37438,10 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering) +"xfq" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_2/starboard) "xgG" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -37232,6 +37505,19 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/central_two) +"xhW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard) "xio" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/embedded_controller/radio/airlock/access_controller{ @@ -37429,12 +37715,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/open, /area/maintenance/wing/starboard) "xoL" = ( @@ -38501,8 +38781,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, @@ -43589,8 +43867,8 @@ dEz nox exw nox -dcT -exC +aJS +dTc nox exw nox @@ -43792,7 +44070,7 @@ ubt uOq uOq uOq -eZo +exC uOq uOq uOq @@ -43994,7 +44272,7 @@ ubt uOq uOq uOq -eZo +exC uOq uOq uOq @@ -44196,7 +44474,7 @@ ubt uOq uOq uOq -eZo +exC uOq uOq uOq @@ -44397,8 +44675,8 @@ dEz nox atB nox -dkq -ihG +dcT +eFo nox atB nox @@ -45622,11 +45900,11 @@ dEz mFc iUr dEz -kFI +tOE uKi pWb pEQ -oIL +fdF nhE scx qgN @@ -45826,9 +46104,9 @@ iUr dEz wmV tNU -oIL +fdF iBT -oIL +fdF rWp whe qgN @@ -46028,10 +46306,10 @@ gvv dEz vyk pGX -oIL +fdF iBT -oIL -oIL +fdF +fdF nhE scx qgN @@ -46228,13 +46506,13 @@ cil uOq hUs dEz -kFI +uEg fsf -oIL +fdF and txc hIT -rWp +sfk whe qgN qgN @@ -46430,13 +46708,13 @@ nsx uOq dRJ dEz -kFI +uEg fQn -oIL +fdF qFW -dLX +deL pEt -oIL +fdF euX scx qgN @@ -46632,13 +46910,13 @@ dEz qxK dEz dEz -kFI +uEg oKR -oIL -ksF -dLX +fdF +qxy +tND lVG -oIL +fdF xTS whe qgN @@ -46836,12 +47114,12 @@ uOq dEz qnE jVX -oIL +fdF qxy -aJS +uuI nFT -oIL -oIL +fdF +fdF nhE scx qgN @@ -47036,15 +47314,15 @@ axW uOq uOq dEz -egY +vxh iDK -oIL -iJp -fsf -fsf -fsf -fQn -rWp +fdF +qxy +pEt +pBB +gyu +rYx +sfk whe qgN qgN @@ -47238,15 +47516,15 @@ nsx uOq uOq dEz -lEe -lWf -uRo -fsf -uEg -uEg -fsf -rYx -oIL +xbY +bYf +nDK +tKo +ipL +deL +wlJ +uEI +fdF euX scx qgN @@ -47441,14 +47719,14 @@ bDj qlm dEz lrh -lWf +iia boE -fsf -fsf -uJk -fsf -fsf -oIL +wCS +nKg +otw +xfq +uEI +fdF xTS whe qgN @@ -47643,14 +47921,14 @@ nEy lnO dEz sqc -lWf -oIL -fsf -eFo -fsf +iia +fdF +wCS +deL +deL wlJ -dZB -oIL +uEI +fdF wWI euX scx @@ -47846,13 +48124,13 @@ aWK dEz msP rNZ -oIL -fsf +fdF +voH gUB -fsf -fsf -pdS -oIL +aiP +hLb +rYx +fdF wWI xTS whe @@ -48047,14 +48325,14 @@ dEz dEz dEz ckc -lWf -oIL +dsl +fdF sgW -oIL -oIL -oIL -oIL -oIL +fdF +fdF +fdF +fdF +fdF wWI wWI nhE @@ -51251,13 +51529,13 @@ qgN qgN qgN ojK -iAB -wWI -wWI -wWI -wWI -wWI -oIL +jjO +fxw +bKd +hGX +vVv +vVv +fdF bwR apd kxd @@ -51273,7 +51551,7 @@ tae gwv gwv gwv -vxh +rVV qSE tae tae @@ -51453,14 +51731,14 @@ qgN qgN qgN aOj -ugZ -wWI -wWI -wWI -wWI -wWI -oIL -bwR +sBt +tND +bGk +gvy +dAN +pDn +fdF +uVi egY dtP czb @@ -51655,14 +51933,14 @@ qgN qgN qgN dzL -ftS -wWI -wWI -oIL -oIL -oIL -oIL -bwR +gJc +bsG +tND +bzH +kie +mxO +fdF +uVi nam xom czb @@ -51857,10 +52135,10 @@ sIi sIi sIi sIi -wWI -wWI -wWI -oIL +kxP +grQ +fZz +gUB pKc hCW aXZ @@ -52063,9 +52341,9 @@ nlr nlr nlr nlr -ctg +oXy cXU -oIL +fdF bDd cWx bPp @@ -52266,7 +52544,7 @@ jMi gNW nlr sjT -cXU +wOd oIL uRo oIL @@ -52468,7 +52746,7 @@ hwT pwO nlr sjT -cXU +xhW nyI gCv ctg @@ -52670,7 +52948,7 @@ fAm fNc nlr oXY -cXU +xhW bmS qbq wWI @@ -52873,10 +53151,10 @@ ajI btv cVR oQy -fsf -fsf -fsf -lWf +cpY +cpY +cpY +oZx gzg wXF wXF @@ -56949,9 +57227,9 @@ oTK oTK oTK gOL -veO -lAI -lAI +lJX +bFA +bFA kHj sKJ tki @@ -61597,7 +61875,7 @@ hUC hUC hUC dnn -xbY +bFA rxb dvw wiz @@ -74091,8 +74369,8 @@ fuu ueH jAo ueH -dSH -kgK +dkq +eZo jAo ueH ueH @@ -74294,7 +74572,7 @@ eFS lBd lBd lBd -rVV +ihG lBd lBd lBd @@ -74496,7 +74774,7 @@ eFS lBd lBd lBd -rVV +ihG lBd lBd lBd @@ -74698,7 +74976,7 @@ eFS lBd lBd lBd -rVV +ihG lBd lBd lBd @@ -74899,8 +75177,8 @@ fuu ueH afe ueH -dTc -tOE +dSH +kgK ueH afe ueH diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index 1719e925056..49a8e868fcf 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -312,8 +312,10 @@ /turf/simulated/floor/tiled/dark, /area/storage/shields) "aK" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/scc_space_ship, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/crew_armory) +/area/maintenance/engineering_ladder) "aL" = ( /obj/machinery/door/window/westleft, /obj/machinery/light{ @@ -2556,6 +2558,12 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) +"fL" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "fM" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -2897,6 +2905,13 @@ }, /turf/simulated/floor/tiled/ramp, /area/hallway/primary/starboard) +"gG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "gH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3223,8 +3238,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -3555,18 +3568,18 @@ icon_state = "pipe-c" }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/security_starboard) "ih" = ( @@ -3633,6 +3646,10 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/window/southleft, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/hallway/primary/starboard) "io" = ( @@ -4436,14 +4453,27 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "kp" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 1 +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "Security Lockdown"; + name = "Security Blast Door"; + opacity = 0 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "investigator_office" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office{ + name = "Security - Investigations Office" + }) "kr" = ( /obj/structure/bed/stool/chair/plastic{ dir = 8 @@ -4700,8 +4730,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "la" = ( @@ -5078,8 +5112,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/investigations) "lY" = ( @@ -5732,9 +5764,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "nx" = ( @@ -6088,10 +6118,10 @@ /area/hallway/primary/starboard) "op" = ( /obj/effect/floor_decal/corner/paleblue{ - dir = 4 + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) @@ -6476,11 +6506,8 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "po" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/hallway/primary/port) +/turf/simulated/wall/r_wall, +/area/maintenance/aux_atmospherics/deck_3) "pp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7005,6 +7032,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/vacantoffice2) +"qr" = ( +/obj/structure/table/rack, +/obj/random/arcade, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "qs" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -7068,11 +7103,13 @@ /area/tcommsat/entrance) "qC" = ( /obj/effect/floor_decal/corner/paleblue{ - dir = 5 + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/hallway/crew_area) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "qD" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -7179,6 +7216,12 @@ /obj/effect/floor_decal/corner/beige/diagonal, /turf/simulated/floor/tiled/white, /area/security/forensics_office) +"qT" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "qU" = ( /turf/simulated/floor/tiled, /area/security/investigations_storage) @@ -7360,17 +7403,14 @@ /turf/simulated/floor, /area/tcommsat/entrance) "rk" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/tiled, -/area/hallway/crew_area) +/area/hallway/primary/starboard) "rl" = ( /turf/simulated/wall, /area/maintenance/security_starboard) @@ -7563,6 +7603,14 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) +"rH" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "rI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7699,6 +7747,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) +"sb" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "sc" = ( /obj/machinery/light_switch{ pixel_x = -14; @@ -7846,6 +7901,18 @@ }, /turf/simulated/floor, /area/maintenance/substation/command) +"st" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "su" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -7968,6 +8035,13 @@ }, /turf/simulated/floor/wood, /area/hallway/primary/starboard) +"sJ" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "sK" = ( /obj/structure/noticeboard{ pixel_x = 31 @@ -8350,6 +8424,16 @@ }, /turf/simulated/floor/carpet/rubber, /area/bridge) +"tF" = ( +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12) + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "tG" = ( /obj/structure/sign/staff_only{ pixel_x = 1; @@ -9065,6 +9149,7 @@ /obj/machinery/light/small/emergency{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/engineering_ladder) "vI" = ( @@ -9268,6 +9353,9 @@ /area/security/forensics_office{ name = "Security - Investigations Office" }) +"wr" = ( +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/maintenance/aux_atmospherics/deck_3) "ws" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -9305,6 +9393,9 @@ "ww" = ( /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) +"wx" = ( +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "wy" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -9501,6 +9592,13 @@ /obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/hallway/primary/port) +"wX" = ( +/obj/machinery/pipedispenser, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "wY" = ( /obj/machinery/door/airlock/command{ id_tag = "captaindoor"; @@ -10617,6 +10715,12 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "zX" = ( @@ -10653,6 +10757,13 @@ dir = 8; icon_state = "pipe-j2" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Aa" = ( @@ -10897,9 +11008,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -10907,6 +11015,9 @@ c_tag = "Third Deck - Investigator Entrance"; dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "AI" = ( @@ -11082,8 +11193,9 @@ /obj/structure/bed/stool/chair{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) @@ -11428,18 +11540,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "BZ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/noticeboard{ layer = 3.3; pixel_x = 2; pixel_y = -32 }, /obj/structure/flora/pottedplant/random, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/lino/grey, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -11610,6 +11720,9 @@ /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor, /area/maintenance/engineering_ladder) "Cz" = ( @@ -11643,6 +11756,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"CF" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "CH" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -11684,6 +11804,12 @@ "CK" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge) +"CM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "CN" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -11773,6 +11899,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) +"CY" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "CZ" = ( /turf/simulated/wall/r_wall, /area/bridge/aibunker) @@ -11846,6 +11977,10 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/window/northleft, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/hallway/primary/starboard) "Dl" = ( @@ -11881,6 +12016,11 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"Dr" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/obj/machinery/meter, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "Dt" = ( /obj/structure/lattice, /obj/machinery/light/spot/weak{ @@ -11945,6 +12085,18 @@ /obj/machinery/firealarm/north, /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) +"DB" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "DC" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 10 @@ -11999,6 +12151,7 @@ /area/bridge/meeting_room) "DJ" = ( /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/engineering_ladder) "DK" = ( @@ -12042,6 +12195,10 @@ c_tag = "Third Deck - Hallway 2"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/hallway/primary/starboard) "DS" = ( @@ -12153,6 +12310,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Eg" = ( @@ -12326,6 +12487,13 @@ }, /turf/simulated/floor/tiled, /area/bridge/third_deck_stairs) +"EG" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "EI" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -12545,6 +12713,13 @@ }, /turf/simulated/floor/wood, /area/lawoffice/representative) +"Fq" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Fr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -12749,6 +12924,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tcommsat/entrance) +"FK" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "FL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12934,6 +13115,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Gs" = ( @@ -13294,6 +13476,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) +"Hm" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "Ho" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -13358,6 +13547,12 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Hu" = ( @@ -13412,6 +13607,19 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"Hy" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "Hz" = ( /turf/simulated/wall, /area/hallway/crew_area) @@ -13571,6 +13779,7 @@ /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(12,61) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/engineering_ladder) "HW" = ( @@ -13700,6 +13909,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"Ip" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Iq" = ( /obj/machinery/door/airlock{ name = "Changing Room" @@ -13892,6 +14109,13 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"IK" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "IL" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -14192,13 +14416,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/lino/grey, /area/security/forensics_office{ name = "Security - Investigations Office" @@ -14309,6 +14533,14 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"JC" = ( +/obj/structure/table/rack, +/obj/random/arcade, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "JD" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 6 @@ -14386,6 +14618,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) +"JN" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + dir = 4; + name = "Aux Tanks Inlet" + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "JO" = ( /obj/structure/lattice, /obj/structure/railing/mapped{ @@ -14982,6 +15221,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/exam) +"Li" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance_hatch{ + req_one_access = list(12,61) + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) +"Lk" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Ll" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15693,6 +15945,10 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/hallway/primary/starboard) "Na" = ( @@ -15930,6 +16186,9 @@ pixel_x = 4; pixel_y = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/lawoffice/representative) "NA" = ( @@ -16126,6 +16385,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/hallway/primary/starboard) "NW" = ( @@ -16141,6 +16404,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) +"NX" = ( +/obj/structure/dispenser/oxygen{ + phorontanks = 10 + }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "NY" = ( /obj/structure/railing/mapped, /turf/simulated/open, @@ -16202,18 +16474,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Oe" = ( @@ -16340,6 +16608,13 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"Os" = ( +/obj/machinery/atmospherics/binary/passive_gate/supply{ + dir = 1; + unlocked = 0 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Ot" = ( /obj/machinery/button/remote/airlock{ id = "bunker2"; @@ -16706,6 +16981,14 @@ temperature = 278 }, /area/tcommsat/chamber) +"Po" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "Pq" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -16746,6 +17029,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/medical/ward/isolation) +"Pu" = ( +/obj/structure/table/rack, +/obj/random/arcade, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "Pw" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, @@ -17162,6 +17453,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Qn" = ( @@ -17301,6 +17598,13 @@ "QD" = ( /turf/simulated/floor/tiled/dark, /area/hallway/primary/port) +"QE" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "QF" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -17332,6 +17636,12 @@ }, /turf/simulated/floor/bluegrid, /area/storage/shields) +"QI" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/maintenance/aux_atmospherics/deck_3) "QJ" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -18247,11 +18557,11 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/security/investigations) @@ -18794,6 +19104,12 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"UC" = ( +/obj/machinery/atmospherics/binary/pump/high_power{ + name = "Aux Tanks Outlet" + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "UF" = ( /obj/machinery/photocopier/faxmachine{ department = "Head of Personnel's Office" @@ -18972,15 +19288,15 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/junction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Vg" = ( @@ -18996,12 +19312,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Vi" = ( @@ -19039,6 +19355,14 @@ }, /turf/simulated/floor/wood, /area/security/vacantoffice2) +"Vl" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/light/small/emergency, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Vm" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor/tiled, @@ -19196,13 +19520,11 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor, /area/maintenance/engineering_ladder) "VE" = ( @@ -19217,9 +19539,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "VI" = ( @@ -19565,6 +19884,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"WF" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + req_one_access = list(12,61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor, +/area/maintenance/aux_atmospherics/deck_3) "WH" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -19631,8 +19957,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) @@ -19674,6 +20003,10 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/bridge) +"WW" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "WX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -19984,7 +20317,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_armory) "XP" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/turf/simulated/wall/r_wall, /area/hallway/primary/port) "XQ" = ( /obj/structure/cable/green{ @@ -20902,6 +21235,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "ZR" = ( @@ -20937,6 +21274,12 @@ temperature = 278 }, /area/tcommsat/chamber) +"ZV" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/maintenance/aux_atmospherics/deck_3) "ZX" = ( /obj/structure/table/standard, /obj/structure/cable/green, @@ -32380,8 +32723,8 @@ at at at GQ -qC -rk +sb +st eb eb eb @@ -41669,7 +42012,7 @@ Ou Ji co Ou -Uq +rk SQ VC NB @@ -41871,7 +42214,7 @@ Ou oY co Ou -Uq +rk Sx Oz xi @@ -42073,7 +42416,7 @@ Ou Ji co Tx -Uq +rk uk yh uk @@ -42275,7 +42618,7 @@ Ou Ji co Ou -Uq +rk rA QA RJ @@ -42476,8 +42819,8 @@ cV Ou zo Oz -kp -Uq +op +rk CN nu lg @@ -42880,7 +43223,7 @@ GE Ou WN QA -op +qC Uq CN ra @@ -43042,14 +43385,14 @@ at at at at -at -at +em +em em Lv lI Fh RX -DJ +EG Hf DX GK @@ -43244,14 +43587,14 @@ at at at at -at -at em +Ip +Li DJ DJ DJ DJ -DJ +sJ FH FH FH @@ -43446,9 +43789,9 @@ at at at at -at -at -aK +em +Fq +DQ DQ DQ DQ @@ -43648,9 +43991,9 @@ at at at at -at -at aK +Fq +DQ EZ oG kJ @@ -43850,9 +44193,9 @@ at at at at -at -at aK +Fq +DQ Nf Bs CR @@ -44052,9 +44395,9 @@ at at at at -at -at aK +Fq +DQ Nd Xr yt @@ -44254,9 +44597,9 @@ at at at at -at -at -aK +em +Fq +DQ Rb CR CR @@ -44456,9 +44799,9 @@ at at at at -at -at -aK +em +Fq +DQ Fx CR CR @@ -44469,15 +44812,15 @@ Gb BX BX OV -XP -XP -XP po po po -XP -XP -wf +po +po +po +po +po +po im Ht rl @@ -44658,9 +45001,9 @@ at at at at -at -at -aK +em +Vl +DQ XO CR CR @@ -44671,15 +45014,15 @@ Cx BX BX Be -XP -at -at -at -at -at -at -at -wf +po +wX +QE +UC +DB +Hm +Po +Hy +tF Ee zZ YB @@ -44860,9 +45203,9 @@ at at at at -at -at -aK +em +Fq +DQ CJ CR Zx @@ -44873,15 +45216,15 @@ Kp Hq zi wW -XP -at -at -at -at -at -at -at -wf +po +JC +wx +IK +IK +CF +wx +gG +wr im Qm rl @@ -45062,28 +45405,28 @@ at at at at -at -at -aK -aK -aK -aK -aK -aK -aK +em +Fq +DQ +DQ +DQ +DQ +DQ +DQ +DQ XP XP XP XP -XP -at -at -at -at -at -at -at -Cu +po +Pu +wx +fL +fL +fL +wx +JN +wr wK WQ Gr @@ -45264,28 +45607,28 @@ at at at at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -Cu +em +Fq +DJ +rH +DJ +DJ +DJ +DJ +DJ +rH +Os +Lk +CY +WF +qT +CM +WW +Dr +WW +CM +ZV +wr Vb HU Tn @@ -45466,28 +45809,28 @@ at at at at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -Cu +em +em +em +em +em +aK +aK +aK +em +em +em +em +em +wr +qr +FK +FK +FK +FK +FK +NX +wr Cu Cu yP @@ -45681,15 +46024,15 @@ at at at at -at -at -at -at -at -at -at -at -at +wr +wr +wr +QI +QI +QI +wr +wr +wr at at at @@ -45706,7 +46049,7 @@ wq Iv lY Iv -Iv +kp wq Fo Fo From 152147ea1b3f9efd7c8ac43eb1758f04b0bd5645 Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Wed, 16 Feb 2022 22:59:15 +0000 Subject: [PATCH 4/4] Greatly reduces amount of gas that pipes can contain, increases initial air supply pressure to compensate. --- code/ATMOSPHERICS/pipes.dm | 6 +++--- code/__defines/machinery.dm | 2 +- maps/sccv_horizon/placeholder-1_deck_1.dmm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 2d707f556b6..6f2b526a28c 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -168,9 +168,9 @@ var/minimum_temperature_difference = 300 var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No - var/maximum_pressure = 70*ONE_ATMOSPHERE - var/fatigue_pressure = 55*ONE_ATMOSPHERE - alert_pressure = 55*ONE_ATMOSPHERE + var/maximum_pressure = 50*ONE_ATMOSPHERE + var/fatigue_pressure = 40*ONE_ATMOSPHERE + alert_pressure = 40*ONE_ATMOSPHERE level = 1 gfi_layer_rotation = GFI_ROTATION_DEFDIR diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 4131ce2f3c8..686bd47923f 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -110,7 +110,7 @@ var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret #define ATMOS_DEFAULT_VOLUME_PUMP 200 // Liters. #define ATMOS_DEFAULT_VOLUME_FILTER 200 // L. #define ATMOS_DEFAULT_VOLUME_MIXER 200 // L. -#define ATMOS_DEFAULT_VOLUME_PIPE 70 // L. +#define ATMOS_DEFAULT_VOLUME_PIPE 7 // L. // Misc process flags. diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index 9fbb2171bac..a0c23c0f0a0 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -9169,7 +9169,7 @@ }, /obj/machinery/atmospherics/binary/pump{ name = "Air to Distro"; - target_pressure = 200; + target_pressure = 2000; use_power = 1 }, /turf/simulated/floor/plating,