From 6207ae47abd883e6ccdb3a95d8f8ab884b39ff49 Mon Sep 17 00:00:00 2001 From: kernikov Date: Sat, 26 Oct 2024 01:21:46 -0500 Subject: [PATCH 1/4] first pass --- maps/metaclub.dmm | 1465 +++++++++++++++++++++------------------------ 1 file changed, 695 insertions(+), 770 deletions(-) diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm index 90d4571e8bf3..4164a9808904 100644 --- a/maps/metaclub.dmm +++ b/maps/metaclub.dmm @@ -7782,9 +7782,8 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/simulated/floor/plating, /area/crew_quarters/fitness{ @@ -7834,7 +7833,8 @@ /area/engineering/supermatter_room) "arW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - default_scrubbed_gases = list( "carbon_dioxide", "plasma", "oxygen", "sleeping_agent") + default_scrubbed_gases = list( "carbon_dioxide", "plasma", "oxygen", "sleeping_agent"); + frequency = 1449 }, /obj/effect/decal/warning_stripes{ icon_state = "bot" @@ -8425,7 +8425,9 @@ /turf/simulated/floor, /area/engineering/supermatter_room) "ats" = ( -/obj/machinery/computer/general_air_control/atmos_automation, +/obj/machinery/computer/general_air_control/atmos_automation{ + frequency = 1449 + }, /obj/effect/decal/warning_stripes{ icon_state = "unloading" }, @@ -8986,13 +8988,11 @@ /turf/simulated/wall, /area/crew_quarters/sleep) "auB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, @@ -9017,9 +9017,12 @@ pixel_x = -25; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/bed, /obj/item/weapon/bedsheet, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" }, @@ -9628,45 +9631,46 @@ }, /area/crew_quarters/sleep) "avK" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "Firelock East" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "unloading" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/simulated/floor{ - icon_state = "neutralcorner" + dir = 8 }, -/area/crew_quarters/sleep) +/area/medical/cryo) "avL" = ( /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/simulated/floor, /area/crew_quarters/sleep) "avM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -29 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" }, /area/crew_quarters/sleep) "avN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/airlock{ id_tag = "Cabin7"; name = "Cabin 1" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" }, @@ -9677,9 +9681,8 @@ }, /area/crew_quarters/sleep) "avP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" @@ -10109,16 +10112,12 @@ /turf/simulated/wall, /area/security/evidence) "awN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor{ - dir = 1; - icon_state = "neutralcorner" +/obj/structure/bed/chair/wood/wings{ + dir = 1 }, -/area/crew_quarters/sleep) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/simulated/floor/carpet, +/area/crew_quarters/courtroom) "awP" = ( /turf/simulated/floor{ icon_state = "dark" @@ -10172,18 +10171,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) -"awV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/simulated/floor, -/area/crew_quarters/sleep) -"awW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/simulated/wall, -/area/crew_quarters/sleep) "awX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -10228,18 +10215,12 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor{ dir = 4 }, /area/engineering/supermatter_room) "axd" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 10 }, @@ -10252,9 +10233,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "unloading" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor{ dir = 4 }, @@ -10522,9 +10500,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 @@ -10793,9 +10768,7 @@ }, /area/crew_quarters/sleep) "ayq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, @@ -10817,7 +10790,10 @@ pixel_x = -25; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" }, @@ -11390,7 +11366,7 @@ id_tag = "Cabin5"; name = "Cabin 3" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/simulated/floor/carpet{ @@ -11398,11 +11374,10 @@ }, /area/crew_quarters/sleep) "azE" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light/small, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/carpet{ icon_state = "bcarpet05" }, @@ -11932,9 +11907,6 @@ /area/crew_quarters/sleep) "aAL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/light/small{ dir = 4 }, @@ -11947,19 +11919,18 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor, /area/crew_quarters/sleep) "aAN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/simulated/wall, -/area/crew_quarters/sleep) +/turf/simulated/floor{ + dir = 6 + }, +/area/medical/cryo) "aAO" = ( /obj/effect/spawner/lootdrop{ loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/trash/cigbutt","/obj/item/trash/chips/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); @@ -12620,22 +12591,27 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aCh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /turf/simulated/floor, /area/crew_quarters/sleep) "aCi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 + dir = 4 }, /turf/simulated/floor{ dir = 4; @@ -12647,6 +12623,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" @@ -15801,6 +15780,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 1; icon_state = "red" @@ -18092,11 +18072,13 @@ /turf/simulated/floor, /area/supply/storage) "aMa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aMb" = ( @@ -18220,22 +18202,7 @@ "aMp" = ( /turf/simulated/wall/r_wall, /area/turret_protected/ai_upload) -"aMq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor, -/area/hallway/primary/fore) "aMr" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/light{ dir = 8 }, @@ -18243,33 +18210,35 @@ dir = 4; pixel_x = -22 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 8; icon_state = "redcorner" }, /area/hallway/primary/fore) "aMs" = ( +/obj/structure/grille, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, /obj/machinery/door/poddoor{ density = 0; icon_state = "pdoor0"; - id_tag = "lawyer_blast"; - name = "Privacy Shutters"; + id_tag = "teleshutt"; + name = "Telescience Privacy Shutters"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/structure/window/full/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor/plating, -/area/lawoffice{ - name = "\improper Internal Affairs Office" - }) +/area/science/telescience) "aMt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ req_access_txt = 1 @@ -18281,31 +18250,17 @@ icon_state = "redcorner" }, /area/hallway/primary/fore) -"aMu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/lawoffice{ - name = "\improper Internal Affairs Office" - }) "aMv" = ( /obj/structure/table/woodentable, /obj/item/weapon/book/manual/security_space_law{ pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/item/weapon/cartridge/lawyer, /turf/simulated/floor/wood, /area/lawoffice{ name = "\improper Internal Affairs Office" }) "aMw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -18314,9 +18269,6 @@ name = "\improper Internal Affairs Office" }) "aMx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -18324,19 +18276,7 @@ /area/lawoffice{ name = "\improper Internal Affairs Office" }) -"aMy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/simulated/floor{ - dir = 6; - icon_state = "dark" - }, -/area/crew_quarters/courtroom) "aMz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "pdoor0"; @@ -19121,10 +19061,12 @@ name = "\improper Internal Affairs Office" }) "aNT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/simulated/floor{ - dir = 6; - icon_state = "dark" + icon_state = "vault"; + tag = "icon-vault" }, /area/crew_quarters/courtroom) "aNU" = ( @@ -19928,7 +19870,6 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 6; icon_state = "dark" @@ -20002,11 +19943,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/simulated/floor{ - dir = 6; - icon_state = "dark" - }, -/area/crew_quarters/courtroom) +/turf/simulated/floor, +/area/science/robotics) "aPu" = ( /obj/structure/bed/chair/comfy/black{ dir = 8; @@ -20019,20 +19957,28 @@ }, /area/crew_quarters/courtroom) "aPv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, /turf/simulated/floor{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/crew_quarters/locker) +/area/science/xenobiology) "aPw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "bot" }, -/turf/simulated/wall, -/area/crew_quarters/courtroom) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + default_scrubbed_gases = list( "carbon_dioxide", "plasma", "oxygen", "sleeping_agent"); + frequency = 1449 + }, +/turf/simulated/floor/plating, +/area/engineering/supermatter_room) "aPx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20060,7 +20006,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -20079,12 +20027,12 @@ }, /area/crew_quarters/locker) "aPA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" @@ -20114,9 +20062,6 @@ }, /area/crew_quarters/locker) "aPD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -20125,6 +20070,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -20144,7 +20092,6 @@ }, /area/crew_quarters/locker) "aPF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14.5-Recreation"; location = "14.3-Lockers-Dorms" @@ -20153,18 +20100,21 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aPG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor{ dir = 6; icon_state = "dark" @@ -20957,6 +20907,9 @@ "aQZ" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 10; icon_state = "dark vault stripe"; @@ -20968,6 +20921,9 @@ dir = 4; name = "Prosecution" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 10; icon_state = "darkred" @@ -20982,6 +20938,9 @@ "aRc" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/fancy/donut_box, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 6; icon_state = "dark vault stripe"; @@ -20989,13 +20948,13 @@ }, /area/crew_quarters/courtroom) "aRd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor{ dir = 6; icon_state = "dark" @@ -21006,6 +20965,9 @@ dir = 8; name = "Defense" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 6; icon_state = "darkgreen"; @@ -21039,9 +21001,20 @@ /turf/simulated/floor, /area/crew_quarters/locker) "aRj" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/simulated/floor, -/area/crew_quarters/locker) +/turf/simulated/floor/plating, +/area/crew_quarters/courtroom) "aRk" = ( /obj/item/weapon/stool{ pixel_y = 8 @@ -21070,41 +21043,39 @@ /turf/simulated/floor, /area/crew_quarters/locker) "aRn" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 +/turf/simulated/floor{ + icon_state = "dark" }, -/turf/simulated/floor, -/area/crew_quarters/locker) +/area/crew_quarters/courtroom) "aRo" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4; + initialize_directions = 11 }, -/turf/simulated/floor, -/area/crew_quarters/locker) +/turf/simulated/floor{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) "aRp" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor, /area/crew_quarters/locker) "aRq" = ( @@ -21129,10 +21100,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor, /area/crew_quarters/locker) "aRt" = ( @@ -21858,25 +21825,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/courtroom) "aSB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/window/full/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "courtroompriv"; - name = "Privacy Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor{ + dir = 4; + icon_state = "whitepurple" }, -/turf/simulated/floor/plating, -/area/crew_quarters/courtroom) +/area/science/xenobiology) "aSC" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -21890,78 +21844,54 @@ icon_state = "browncorner" }, /area/storage/primary) -"aSD" = ( -/obj/item/weapon/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/layer_adapter/scrubbers/hidden{ - dir = 8 - }, -/turf/simulated/floor, -/area/crew_quarters/locker) "aSE" = ( /obj/item/weapon/storage/pill_bottle/dice, /obj/structure/table/woodentable/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor, /area/crew_quarters/locker) "aSF" = ( /obj/item/weapon/stool{ pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor{ icon_state = "floorgrime" }, /area/crew_quarters/locker) "aSG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 - }, /obj/machinery/media/receiver/boombox/wallmount/muzak{ pixel_x = 28 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aSH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor{ + dir = 4; + icon_state = "neutralcorner" }, -/turf/simulated/floor, -/area/crew_quarters/locker) +/area/hallway/primary/central) "aSI" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor, /area/gateway) "aSJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/item/weapon/stool{ + pixel_y = 8 }, -/turf/simulated/wall/r_wall, -/area/gateway) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor, +/area/crew_quarters/locker) "aSK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/decal/warning_stripes{ dir = 1; icon_state = "warning"; @@ -21975,9 +21905,7 @@ icon_state = "warning_corner"; tag = "icon-warning_corner (EAST)" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor, /area/gateway) "aSM" = ( @@ -21994,14 +21922,12 @@ /turf/simulated/floor, /area/gateway) "aSN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/decal/warning_stripes{ dir = 1; icon_state = "warning"; tag = "icon-warning (NORTH)" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor, /area/gateway) "aSO" = ( @@ -22571,6 +22497,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -22688,25 +22617,19 @@ pixel_x = 2; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor/wood, /area/lawoffice{ name = "\improper Internal Affairs Office" }) "aUb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 }, /turf/simulated/floor/wood, /area/lawoffice{ name = "\improper Internal Affairs Office" }) "aUc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/machinery/vending/cigarette, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; @@ -22717,10 +22640,24 @@ }, /area/crew_quarters/courtroom) "aUd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/wall, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/full/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "pdoor0"; + id_tag = "courtroompriv"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/simulated/floor/plating, /area/crew_quarters/courtroom) "aUe" = ( /obj/structure/bed/chair/wood/wings{ @@ -22743,6 +22680,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -22759,6 +22697,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aUj" = ( @@ -22781,6 +22722,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aUl" = ( @@ -22789,7 +22733,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "floorgrime" }, @@ -22803,8 +22749,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/simulated/floor, /area/crew_quarters/locker) @@ -22823,17 +22769,17 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/simulated/floor, /area/crew_quarters/locker) "aUp" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/toy/cards, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aUq" = ( @@ -22842,15 +22788,15 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 }, /turf/simulated/floor, /area/crew_quarters/locker) "aUr" = ( /obj/structure/table, /obj/item/device/paicard, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/simulated/floor, @@ -22861,17 +22807,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 }, /turf/simulated/floor{ icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aUt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -22882,12 +22825,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aUu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -22898,6 +22841,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aUv" = ( @@ -22910,41 +22856,41 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/command{ name = "Gateway"; req_access_txt = "62" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aUw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aUx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump{ + on = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 + }, /turf/simulated/floor, /area/gateway) "aUy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -22960,9 +22906,7 @@ /turf/simulated/floor, /area/gateway) "aUA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor, /area/gateway) "aUB" = ( @@ -23514,7 +23458,6 @@ /turf/simulated/floor, /area/hallway/secondary/entry) "aVv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/vending/discount, /turf/simulated/floor{ icon_state = "dark" @@ -23599,9 +23542,8 @@ }, /area/crew_quarters/locker) "aVC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, /turf/simulated/floor, /area/crew_quarters/locker) @@ -23619,6 +23561,9 @@ pixel_y = -26; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aVF" = ( @@ -23627,14 +23572,14 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aVG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/simulated/floor, /area/gateway) "aVH" = ( @@ -23647,6 +23592,9 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aVI" = ( @@ -23670,6 +23618,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "aVJ" = ( @@ -23698,6 +23649,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/simulated/floor, /area/gateway) "aVL" = ( @@ -24115,9 +24069,6 @@ }, /area/turret_protected/ai_upload_foyer) "aWy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light{ dir = 8 }, @@ -24126,6 +24077,9 @@ pixel_y = -24 }, /obj/structure/flora/pottedplant/random, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -24228,6 +24182,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -24236,6 +24193,9 @@ /obj/machinery/newscaster{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -24267,7 +24227,7 @@ /area/crew_quarters/courtroom) "aWL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 + dir = 4 }, /turf/simulated/floor{ icon_state = "dark" @@ -24325,7 +24285,6 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, @@ -24336,6 +24295,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, @@ -24969,6 +24929,7 @@ }) "aXU" = ( /obj/machinery/vending/groans, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ icon_state = "dark" }, @@ -24991,13 +24952,20 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "dark" }, /area/crew_quarters/courtroom) "aXW" = ( +/obj/structure/bed/chair/wood/wings{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/simulated/wall, +/turf/simulated/floor/carpet, /area/crew_quarters/courtroom) "aXX" = ( /obj/machinery/door/airlock/glass{ @@ -25068,10 +25036,6 @@ tag = "icon-vault" }, /area/crew_quarters/locker) -"aYf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/simulated/wall, -/area/crew_quarters/locker) "aYg" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -25081,6 +25045,7 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor/plating, /area/crew_quarters/locker) "aYh" = ( @@ -25633,7 +25598,6 @@ }, /area/hallway/primary/central) "aZn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/glass{ name = "Courtroom" }, @@ -25654,11 +25618,11 @@ dir = 8 }, /obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor/plating, /area/crew_quarters/courtroom) "aZp" = ( /obj/machinery/vending/discount, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" @@ -26455,7 +26419,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 21 @@ -26588,7 +26551,9 @@ }, /area/engineering/mechanics) "baX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor/plating{ icon_state = "panelscorched"; tag = "icon-panelscorched" @@ -26600,8 +26565,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -28458,8 +28423,8 @@ /area/hallway/primary/central) "beh" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 }, /turf/simulated/floor{ dir = 8; @@ -28467,13 +28432,13 @@ }, /area/hallway/primary/central) "bei" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 8; icon_state = "neutralcorner" @@ -41583,7 +41548,7 @@ /area/hallway/secondary/entry) "bBe" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 4 }, /turf/simulated/floor{ icon_state = "white" @@ -45700,9 +45665,7 @@ }, /area/science/podbay) "bID" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor{ icon_state = "white" }, @@ -49368,29 +49331,15 @@ /turf/simulated/floor, /area/hallway/primary/central) "bOF" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "barwindow"; - name = "bar shutters"; - opacity = 0 +/obj/item/weapon/stool{ + pixel_y = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +/turf/simulated/floor, +/area/crew_quarters/locker) "bOG" = ( /obj/machinery/camera{ dir = 1; @@ -50932,7 +50881,6 @@ /area/maintenance/starboard) "bRK" = ( /obj/machinery/vending/autodrobe, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small{ dir = 1 }, @@ -50943,6 +50891,7 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -55155,10 +55104,6 @@ }, /area/hallway/primary/central) "bYX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/power/apc{ cell_type = 10000; dir = 1; @@ -55169,6 +55114,10 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1; + initialize_directions = 11 + }, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -55777,12 +55726,12 @@ }, /area/hallway/primary/central) "cai" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor, /area/hallway/primary/central) "caj" = ( @@ -57032,7 +56981,9 @@ }, /area/hallway/primary/central) "ccF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + req_access_txt = 1 + }, /turf/simulated/floor{ dir = 8; icon_state = "purplecorner" @@ -57864,7 +57815,9 @@ dir = 1; name = "Firelock North" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + req_access_txt = 1 + }, /turf/simulated/floor{ dir = 8; icon_state = "purple" @@ -57915,11 +57868,11 @@ }, /area/hallway/primary/central) "cea" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "Firelock North" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 4; icon_state = "purple" @@ -58488,7 +58441,9 @@ }, /area/hallway/primary/aft) "cfj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + req_access_txt = 1 + }, /turf/simulated/floor{ dir = 1; icon_state = "whitepurplecorner" @@ -58519,13 +58474,12 @@ /obj/item/tool/screwdriver{ pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 1; icon_state = "whitepurple" @@ -59292,8 +59246,8 @@ }, /area/hallway/primary/aft) "cgC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, /turf/simulated/floor{ icon_state = "white" @@ -59327,8 +59281,8 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + initialize_directions = 11 }, /turf/simulated/floor{ icon_state = "white" @@ -59910,6 +59864,9 @@ }) "chD" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, /turf/simulated/floor{ icon_state = "whiteyellow" }, @@ -60126,12 +60083,10 @@ /area/hallway/primary/aft) "chX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/simulated/floor{ - icon_state = "white" + dir = 4 }, -/area/hallway/primary/aft) +/turf/simulated/floor, +/area/science/chargebay) "chY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ @@ -60143,9 +60098,6 @@ }, /area/hallway/primary/aft) "chZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ icon_state = "white" @@ -60421,14 +60373,18 @@ }, /area/engineering/atmos) "ciw" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "24" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/filtering/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/simulated/floor/plating, -/area/engineering/atmos) +/turf/simulated/floor{ + icon_state = "white" + }, +/area/science/xenobiology) "cix" = ( /obj/machinery/light/small{ dir = 1 @@ -60827,7 +60783,6 @@ }, /area/hallway/primary/aft) "cjh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/simulated/floor{ icon_state = "whitepurple" @@ -60898,8 +60853,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -60917,8 +60872,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -61678,7 +61633,6 @@ name = "Research Division" }) "ckz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard"; @@ -61734,12 +61688,6 @@ /obj/item/trash/cigbutt, /turf/simulated/floor/plating, /area/maintenance/starboard) -"ckG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "ckH" = ( /turf/simulated/wall/r_wall, /area/science/telescience) @@ -61757,7 +61705,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor/plating, /area/science/telescience) "ckJ" = ( @@ -62340,7 +62287,6 @@ name = "Research Division" }) "clJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_medical{ @@ -62361,9 +62307,6 @@ name = "Research Division" }) "clK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - req_access_txt = 1 - }, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard"; name = "biohazard containment door" @@ -62394,9 +62337,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -63052,7 +62992,6 @@ name = "Research Division" }) "cmS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/shower{ dir = 4; @@ -63156,9 +63095,6 @@ }) "cna" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -63193,30 +63129,28 @@ name = "Research Division" }) "cnc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "floorgrime" }, -/area/science/hallway{ - name = "Research Division" - }) +/area/crew_quarters/locker) "cnd" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/simulated/floor{ icon_state = "white" }, /area/science/telescience) "cne" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -63227,6 +63161,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -63704,9 +63641,6 @@ /obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/micro_laser, /obj/item/weapon/stock_parts/micro_laser, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/weapon/paper_bin/purple{ pixel_y = -9 }, @@ -63714,6 +63648,9 @@ /obj/item/weapon/stock_parts/micro_laser, /obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/manipulator, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/simulated/floor{ dir = 4; icon_state = "whitepurple" @@ -63773,23 +63710,14 @@ name = "Research Division" }) "coc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + on = 1 }, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/turf/simulated/floor{ + icon_state = "neutralcorner" }, -/obj/structure/window/full/reinforced, -/turf/simulated/floor/plating, -/area/science/lab) +/area/crew_quarters/locker) "cod" = ( /obj/machinery/light, /turf/simulated/floor{ @@ -63866,7 +63794,6 @@ }, /area/medical/paramedics) "cok" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/trash/cigbutt, /turf/simulated/floor{ dir = 5; @@ -63877,6 +63804,7 @@ name = "Research Division" }) "col" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -64498,6 +64426,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "whitepurple" @@ -64549,9 +64478,6 @@ name = "Research Division" }) "cpt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ dir = 8; @@ -64566,6 +64492,9 @@ icon_state = "warning"; tag = "icon-warning (SOUTHWEST)" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -64695,8 +64624,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, /turf/simulated/floor{ dir = 5; @@ -64707,6 +64636,7 @@ name = "Research Division" }) "cpC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "whitepurplecorner" }, @@ -65431,6 +65361,7 @@ name = "Science - Research and Development"; network = list("SS13","RD") }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "whitepurple" @@ -65742,6 +65673,7 @@ /turf/simulated/floor, /area/medical/surgery) "crk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "whitepurplecorner" @@ -66062,20 +65994,20 @@ /turf/simulated/floor/plating, /area/medical/paramedics) "crN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/simulated/floor{ - dir = 8; - icon_state = "whitepurple" + dir = 1 }, -/area/science/lab) +/area/science/robotics) "crO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/simulated/floor{ - icon_state = "white" + dir = 4; + icon_state = "whitepurple" }, /area/science/lab) "crP" = ( @@ -66090,22 +66022,24 @@ /area/hallway/primary/aft) "crQ" = ( /obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/window/reinforced, /obj/structure/window/full/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "pdoor0"; + id_tag = "courtroompriv"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor/plating, -/area/science/lab) +/area/crew_quarters/courtroom) "crR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -66122,15 +66056,15 @@ name = "Research Division" }) "crS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/simulated/floor{ dir = 4; icon_state = "whitepurple" }, /area/science/lab) "crT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor{ icon_state = "white" @@ -66138,9 +66072,6 @@ /area/science/lab) "crU" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor{ icon_state = "white" }, @@ -66186,6 +66117,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, /area/science/lab) "crY" = ( @@ -66193,9 +66127,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/simulated/floor{ dir = 9; icon_state = "whitepurple" @@ -66851,6 +66783,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -66909,12 +66844,18 @@ name = "Research and Development"; req_access_txt = "7" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4; icon_state = "whitepurplefull" }, /area/science/lab) "ctj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/simulated/floor{ dir = 8; icon_state = "whitepurple" @@ -67060,8 +67001,8 @@ dir = 8; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/simulated/floor{ icon_state = "white" @@ -67073,6 +67014,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67118,6 +67062,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67132,6 +67079,9 @@ dir = 8; name = "Firelock West" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67140,6 +67090,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67150,6 +67103,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67176,6 +67132,9 @@ pixel_x = -12; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/simulated/floor{ dir = 1; icon_state = "whitepurplecorner" @@ -67426,7 +67385,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 + dir = 4 }, /turf/simulated/floor{ dir = 6 @@ -67469,6 +67428,9 @@ name = "Cryogenics Gas Pump"; on = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 4 }, @@ -67477,6 +67439,9 @@ /obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/medical/cryo) "cub" = ( @@ -67491,10 +67456,8 @@ name = "Research Division" }) "cuc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/simulated/floor{ dir = 8; icon_state = "whiteblue" @@ -67763,6 +67726,9 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67772,6 +67738,9 @@ "cux" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67832,6 +67801,9 @@ dir = 1; on = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -67843,10 +67815,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -67991,6 +67960,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -68009,12 +67981,14 @@ name = "Research Division" }) "cuQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -72331,9 +72305,6 @@ name = "Genetics Desk"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/weapon/folder/white, /obj/item/weapon/pen, /obj/item/weapon/paper_bin/purple{ @@ -72718,6 +72689,9 @@ }, /area/medical/genetics) "cCj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/simulated/floor{ dir = 4; icon_state = "purplecorner" @@ -72821,8 +72795,8 @@ /turf/simulated/floor, /area/science/chargebay) "cCs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/simulated/floor{ dir = 4; @@ -74336,6 +74310,7 @@ req_access_txt = "29" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor, /area/science/chargebay) "cFb" = ( @@ -74967,6 +74942,7 @@ /area/hallway/primary/aft) "cGb" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor, /area/science/robotics) "cGc" = ( @@ -75637,6 +75613,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/simulated/floor{ dir = 1 }, @@ -76159,9 +76138,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/simulated/floor{ dir = 1; icon_state = "neutralcorner" @@ -76255,12 +76232,12 @@ /turf/simulated/floor, /area/science/robotics) "cIe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ dir = 4; name = "Science - Hallway - S"; network = list("SS13","RD") }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -76834,6 +76811,7 @@ /area/medical/virology) "cIZ" = ( /obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; on = 1 }, /turf/simulated/floor, @@ -77426,7 +77404,6 @@ /turf/simulated/floor, /area/science/robotics) "cKb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -78128,7 +78105,6 @@ name = "Robotics Maintenance"; req_access_txt = "29" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -78553,9 +78529,6 @@ }, /area/science/xenobiology) "cLO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -78564,6 +78537,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/hallway/primary/aft) "cLP" = ( @@ -78634,14 +78610,14 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cLW" = ( @@ -78739,9 +78715,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM"; @@ -79005,10 +78978,10 @@ /turf/simulated/wall, /area/hallway/secondary/exit) "cMA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + req_access_txt = 1 + }, /turf/simulated/floor{ icon_state = "ramptop" }, @@ -79019,9 +78992,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor{ icon_state = "ramptop" @@ -79141,9 +79111,8 @@ name = "Station Intercom (General)"; pixel_x = 29 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, /turf/simulated/floor{ dir = 4; @@ -79604,7 +79573,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "unloading" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 5; icon_state = "whitehall" @@ -79629,9 +79597,6 @@ name = "SERVER ROOM"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple{ - dir = 4 - }, /turf/simulated/floor/plating, /area/science/server{ name = "\improper Research Division Server Room" @@ -80080,12 +80045,6 @@ /turf/simulated/floor{ icon_state = "hydrofloor" }, -/area/science/hallway{ - name = "Research Division" - }) -"cOm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/wall/r_wall, /area/science/hallway{ name = "Research Division" }) @@ -80569,7 +80528,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/simulated/floor{ dir = 1; icon_state = "whitepurple" @@ -80577,22 +80536,10 @@ /area/science/xenobiology) "cPd" = ( /obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor{ - dir = 1; - icon_state = "whitepurple" + dir = 8 }, -/area/science/xenobiology) +/turf/simulated/floor/plating, +/area/engineering/supermatter_room) "cPe" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -80971,7 +80918,6 @@ /obj/machinery/door/firedoor/border_only{ name = "Firelock South" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "whitepurple" }, @@ -80983,7 +80929,6 @@ /obj/machinery/door/firedoor/border_only{ name = "Firelock South" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ icon_state = "whitepurple" }, @@ -81429,7 +81374,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "whitepurplefull" @@ -81789,7 +81733,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -81807,7 +81750,7 @@ network = list("SS13","RD") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 + dir = 10 }, /turf/simulated/floor{ icon_state = "white" @@ -82159,7 +82102,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -82178,6 +82120,7 @@ tag = "icon-warning (EAST)" }, /obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -82466,7 +82409,7 @@ tag = "icon-warning" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + dir = 10 }, /turf/simulated/floor{ icon_state = "white" @@ -82483,6 +82426,7 @@ icon_state = "warning"; tag = "icon-warning (SOUTHEAST)" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ icon_state = "white" }, @@ -82635,7 +82579,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 4; icon_state = "whitepurplefull" @@ -82909,6 +82853,9 @@ name = "Xenobiology - Lab Entrance"; network = list("SS13","RD") }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/simulated/floor{ dir = 8; icon_state = "whitepurple" @@ -82926,6 +82873,9 @@ }, /area/science/xenobiology) "cTu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/simulated/floor{ dir = 4; icon_state = "whitepurple" @@ -83107,6 +83057,7 @@ /turf/simulated/floor/plating, /area/science/xenobiology) "cTP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 8; icon_state = "whitepurple" @@ -83343,6 +83294,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 8; icon_state = "whitepurple" @@ -83361,16 +83313,12 @@ /turf/simulated/floor/plating, /area/science/xenobiology) "cUr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor{ - icon_state = "white" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/area/science/xenobiology) +/turf/simulated/floor, +/area/science/chargebay) "cUs" = ( /obj/machinery/light/small{ dir = 4 @@ -83550,6 +83498,7 @@ }, /area/science/xenobiology) "cUK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor{ dir = 1; icon_state = "whitepurplecorner" @@ -83789,19 +83738,6 @@ icon_state = "white" }, /area/science/xenobiology) -"cVl" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor{ - icon_state = "white" - }, -/area/science/xenobiology) "cVm" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -83846,7 +83782,8 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor{ icon_state = "white" @@ -84037,8 +83974,8 @@ }, /area/science/xenobiology) "cVI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 }, /turf/simulated/floor{ icon_state = "white" @@ -125772,15 +125709,6 @@ icon_state = "freezerfloor" }, /area/prison/rec_room) -"hMm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor/plating{ - icon_state = "platingdmg2"; - tag = "icon-platingdmg2" - }, -/area/maintenance/fore) "hUs" = ( /obj/machinery/light/small{ dir = 8 @@ -125890,16 +125818,13 @@ }, /area/prison/rec_room) "iCI" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/simulated/floor, -/area/crew_quarters/locker) +/turf/simulated/floor{ + dir = 6 + }, +/area/medical/cryo) "iEG" = ( /turf/simulated/floor, /area/security/interrogation) @@ -126109,11 +126034,9 @@ }, /area/medical/genetics) "jjR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/simulated/floor, +/area/science/robotics) "jkt" = ( /turf/simulated/wall/r_wall, /area/security/vacantoffice2{ @@ -126617,11 +126540,21 @@ }, /area/security/main) "moj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/fore) +/area/security/range{ + name = "\improper Security E.V.A" + }) "moy" = ( /obj/machinery/power/apc{ dir = 8; @@ -126799,12 +126732,7 @@ /turf/simulated/floor/carpet, /area/security/main) "mTU" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/layer_adapter/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/simulated/floor, @@ -127874,6 +127802,9 @@ dir = 8; name = "Firelock West" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/gateway) "rcO" = ( @@ -128005,12 +127936,6 @@ /area/security/gas_chamber{ name = "Firing Range" }) -"rFz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor, -/area/crew_quarters/locker) "rIj" = ( /obj/docking_port/destination/pod5/shuttle{ dir = 8 @@ -128031,14 +127956,11 @@ name = "Brig Dormitories" }) "rOH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/simulated/floor{ + icon_state = "floorgrime" }, -/turf/simulated/floor, -/area/hallway/primary/central) +/area/crew_quarters/locker) "rOW" = ( /obj/structure/cable/orange{ d2 = 2; @@ -128264,9 +128186,9 @@ /turf/simulated/floor, /area/security/brig) "sDI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/turf/simulated/floor, +/area/crew_quarters/sleep) "sEg" = ( /obj/machinery/airlock_sensor{ frequency = 1331; @@ -128375,14 +128297,16 @@ /turf/simulated/floor/plating, /area/security/brig) "taa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 + dir = 9 }, /turf/simulated/floor, -/area/hallway/primary/central) +/area/gateway) "tcq" = ( /obj/structure/shuttle/diag_wall/smooth{ dir = 8 @@ -128432,9 +128356,14 @@ name = "Port Maintenance" }) "ttX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor, -/area/crew_quarters/locker) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/simulated/floor{ + icon_state = "vault"; + tag = "icon-vault" + }, +/area/crew_quarters/courtroom) "tva" = ( /obj/structure/grille, /obj/structure/window/full/reinforced, @@ -128505,11 +128434,12 @@ name = "Firing Range" }) "tFq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/structure/bed/chair/wood/wings{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor/carpet, +/area/crew_quarters/courtroom) "tGA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/simulated/floor, @@ -128534,11 +128464,18 @@ name = "\improper Security E.V.A" }) "tKc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/simulated/floor{ + icon_state = "floorgrime" + }, +/area/crew_quarters/locker) "tLH" = ( /turf/simulated/floor{ icon_state = "dark" @@ -128580,9 +128517,6 @@ dir = 4 }, /obj/structure/window/full/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/brig) "tTG" = ( @@ -128676,12 +128610,6 @@ icon_state = "redcorner" }, /area/hallway/primary/fore) -"ums" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/simulated/floor, -/area/crew_quarters/locker) "uoH" = ( /turf/simulated/floor/wood, /area/security/vacantoffice2{ @@ -129368,13 +129296,10 @@ }, /area/security/medical) "yci" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor{ - icon_state = "floorgrime" - }, -/area/crew_quarters/locker) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/simulated/floor, +/area/science/chargebay) "yfU" = ( /turf/simulated/floor{ icon_state = "freezerfloor" @@ -229104,7 +229029,7 @@ coU cqo crp crp -cqo +aAN bVj coT cxc @@ -229606,7 +229531,7 @@ coV cqr crt csL -csL +iCI cvi coT bVo @@ -231112,7 +231037,7 @@ coT coT crr csK -csK +avK crr coT cxe @@ -236552,7 +236477,7 @@ tNV rDX wXy tNV -gKg +moj qGv gKg psr @@ -241096,7 +241021,7 @@ aGQ aIq aJE aKZ -aMq +aKZ aNL aPj aQR @@ -241598,7 +241523,7 @@ aGT aIt aJH aLc -aMt +aLc aNO aLc aLc @@ -241652,7 +241577,7 @@ cmL cmL cpo cqJ -crP +cjc cjc cjc cuE @@ -242100,7 +242025,7 @@ aGS aIs aJG aLb -aMs +aLb aNN aJK aQT @@ -242154,7 +242079,7 @@ cks cks cks cks -crQ +cur ctc cur cks @@ -242656,7 +242581,7 @@ cmJ cnU cpm cqH -crN +cmK cta cup cks @@ -243104,7 +243029,7 @@ aEp aIu aJI aLd -aMu +aNP aNP aPl aQU @@ -243158,7 +243083,7 @@ cmK cnV cCY cpn -crO +cmO ctb cuq cks @@ -243675,8 +243600,8 @@ cBB cEe cyu cGd -cHc -cHc +aPt +jjR cIZ cKb cLc @@ -244154,7 +244079,7 @@ ccF cdV cfj cgC -chX +cgB cjd ckw clG @@ -244177,7 +244102,7 @@ cBB cCZ cBE cGc -cGc +crN cId cIX cKc @@ -244615,7 +244540,7 @@ aJN aJN aJN aJN -aUd +aJN aJN aJN aJN @@ -244656,7 +244581,7 @@ ccC cea ceY cgA -cgo +cgB cjd ckv clE @@ -244675,8 +244600,8 @@ czo cAy cAy cAy -cAy -cAy +cUr +yci cFa cGb cHa @@ -245112,8 +245037,8 @@ aGV aIy aJM aLh -aMy -aNT +aLh +aLh aPo aPG aSx @@ -245158,7 +245083,7 @@ ccE cdT cfh cgB -cgo +cgB cjd ckw clF @@ -245167,7 +245092,7 @@ cnX cpp cqL crS -crS +crO cut cvt cwv @@ -245177,7 +245102,7 @@ czt cAz cAz cCo -cAz +chX cAz cBE nUw @@ -245660,12 +245585,12 @@ ccE cdY cfl bBe -cgo +cgB cjg cks cks cks -coc +cur cks cks crX @@ -245679,7 +245604,7 @@ czv cAD cAz cCr -cAz +chX cEg cyu cGf @@ -246621,15 +246546,15 @@ aLk aMC aLh aLh -aRb -aSA -aUe -aUe -aVy +aNT +crQ +tFq +tFq +aRo aXU aZo -bas -aZg +aSH +bcs beh bgo biu @@ -247209,7 +247134,7 @@ cTs cTP cUp cUK -cVl +cVk cVI cVW cWn @@ -247625,14 +247550,14 @@ aLm aME aLh aLh -aRb -aSx -aUe -aVx -aUf +ttX +aUd +awN +aXW +aRn aXV -aZo -bas +aRj +baK bct bed bgo @@ -247707,10 +247632,10 @@ cRm cRW cSC cSU +ciw +aPv cTt cTt -cUr -cUr cVp cVL cWa @@ -248131,11 +248056,11 @@ aRc aSy aUe aVx -aUf +aWL aJN aJN baJ -bcs +aZg bei bgo biv @@ -248201,15 +248126,15 @@ cLf cMa cMK cNv -cOm -cPd +clI +cPa cPN -cQD +cQA cRn cRX cSD -cQA -cTu +cQD +aSB cTu cUs cLN @@ -248634,9 +248559,9 @@ aSy aUe aVx aWL -aXW +aJN aZp -baK +bas aZg bed bgo @@ -249130,9 +249055,9 @@ aJN aLn aMF aNX -aPt +aLh aRd -aSB +aSA aUg aVy aWK @@ -249632,7 +249557,7 @@ aJN aJN aJN aJN -aPw +aJN aJN aJN aJN @@ -250134,15 +250059,15 @@ adX anw adz aNY -aPv +aNY aRf aSh aTS aUh -aWM -aXX -aZq -taa +oVK +uyh +bMN +cbl bcs bek bgp @@ -250638,13 +250563,13 @@ aMG aOa aPy aRh -ums -nqn -ttX -oVK -uyh -bMN -rOH +aRi +aRq +aRi +aWM +aXX +aZq +baF bcg bem bgr @@ -251140,7 +251065,7 @@ aCc aNZ aPx aRg -iCI +aRg aUi aRi aWM @@ -251642,7 +251567,7 @@ aCc aOc aPz aRi -yci +aRh aUk aVB aWN @@ -252144,8 +252069,8 @@ aCc aOb aPz aRh -jeC -aUj +aRk +aRq aRi aWM aXY @@ -252171,7 +252096,7 @@ brL bJx bLj bMP -bOF +bJx bQa bRA bSW @@ -252188,9 +252113,9 @@ cfs cgN bXV cjl -ckG +buf clK -cnc +coi cok cpB cqU @@ -252649,7 +252574,7 @@ aRk aSE aUm aVC -aWM +coc aYb aZt baQ @@ -253147,10 +253072,10 @@ aGY aMH aOd aPA -aRj -aSD -aUl aRi +aRk +aUl +mTU aWM aYa aZt @@ -253650,9 +253575,9 @@ aCc aOg aPB aRm -mTU +aRg aUo -aRi +mTU aWM aYd aZt @@ -254152,9 +254077,9 @@ aCc aOf aPB aRl -rFz -aUn -aRh +aRi +jeC +cnc aWM aYc aZt @@ -254653,10 +254578,10 @@ aLs aCc aOi aPC -aRo -jeC +nqn +aSJ aUq -aRk +aUn aWM aYe aZt @@ -254703,7 +254628,7 @@ clL cnd col cpC -cqV +aMs crk bRL cuL @@ -255155,10 +255080,10 @@ aLr aCc aOh aPC -aRn -jeC +nqn +aSJ aUp -aRk +aUn aWM aXY aZt @@ -255657,10 +255582,10 @@ aCc aCc aOk aPE -aRq +aUj aSF aUr -aRk +aUn aWP aXZ aZt @@ -255709,7 +255634,7 @@ coq bGr cqV csm -crZ +cDl crZ cvE cwO @@ -256160,9 +256085,9 @@ aMJ aOj aPD aRp -yci -aUn -aRh +aVD +bOF +rOH aWO aXZ aZt @@ -256211,7 +256136,7 @@ cor cpH ckH crZ -crZ +cDl cuP cvE cwP @@ -256662,12 +256587,12 @@ aMK aOm aMa aRs -aSH +aRg aUt -aVB +tKc aWR aYg -adU +bgB baY bcC bew @@ -256713,7 +256638,7 @@ coo cpF ckH cri -crZ +cDl crZ cvE cvE @@ -257166,10 +257091,10 @@ aPF aRr aSG aUs -aVD +cnc aWQ -aYf -anv +aXZ +adX baX atf bev @@ -257666,7 +257591,7 @@ aLw aLw aLw aLw -aSJ +aLw aUv raX aLw @@ -258151,7 +258076,7 @@ aqo arG atk avp -awN +azz axD ayp azz @@ -258654,9 +258579,9 @@ arJ auz auC avL -awV +aEH ayr -azC +sDI aAM aCh azC @@ -259155,10 +259080,10 @@ aqp arI atj auB -avK awU +aFU ayq -azB +awU aAL aCg azB @@ -259656,12 +259581,12 @@ aoS aqr arL atg -atg +auA avN -awX atg +auA azD -awX +atg aCj aDz atg @@ -259675,7 +259600,7 @@ aMO aPK aRx aSN -aUw +taa aVI aLw aqi @@ -260160,10 +260085,10 @@ arK atg auD avM -awW +atg ays avM -aAN +atg aCi aDy atg @@ -265679,11 +265604,11 @@ afm afm afm arR -sDI -sDI -sDI -sDI -moj +adX +adX +adX +adX +adX azH ayA aCq @@ -266185,7 +266110,7 @@ ato auK adz awZ -tKc +adX azH ayA aCp @@ -266687,7 +266612,7 @@ aaa aaa adz axb -hMm +ayu azH ayA ayA @@ -267189,7 +267114,7 @@ aaa aaa adz axa -tKc +adX azH ayA aCr @@ -267690,8 +267615,8 @@ arS aam aam adz -tFq -jjR +adX +adX azH ayA aCt @@ -270195,7 +270120,7 @@ aaO aaO anG aoX -amv +cPd anG atq auM @@ -274776,7 +274701,7 @@ bTx bRS bRS cho -ciw +ciz chp aam aaa @@ -275718,7 +275643,7 @@ amx anM ape amv -arW +aPw atx auQ awc From 06d3a4ddfd9f234c1b5ccd482b49bb918cd28b87 Mon Sep 17 00:00:00 2001 From: kernikov Date: Sat, 26 Oct 2024 17:12:04 -0500 Subject: [PATCH 2/4] removes dorms atmos portables just go to engineering --- maps/metaclub.dmm | 103 +++++++--------------------------------------- 1 file changed, 14 insertions(+), 89 deletions(-) diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm index 4164a9808904..30281f9e9e5e 100644 --- a/maps/metaclub.dmm +++ b/maps/metaclub.dmm @@ -19163,30 +19163,20 @@ }, /area/crew_quarters/locker) "aOf" = ( -/obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/pump, /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "unloading" - }, /obj/machinery/status_display{ pixel_y = 30 }, /turf/simulated/floor, /area/crew_quarters/locker) "aOg" = ( -/obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/pump, -/obj/effect/decal/warning_stripes{ - icon_state = "unloading" - }, /turf/simulated/floor, /area/crew_quarters/locker) "aOh" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/portable_atmospherics/scrubber, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 26 @@ -19194,17 +19184,11 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "unloading" - }, +/obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor, /area/crew_quarters/locker) "aOi" = ( -/obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/scrubber, -/obj/effect/decal/warning_stripes{ - icon_state = "unloading" - }, /turf/simulated/floor, /area/crew_quarters/locker) "aOj" = ( @@ -20038,29 +20022,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aPB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) -"aPC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) "aPD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21884,13 +21845,6 @@ }, /turf/simulated/floor, /area/gateway) -"aSJ" = ( -/obj/item/weapon/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor, -/area/crew_quarters/locker) "aSK" = ( /obj/effect/decal/warning_stripes{ dir = 1; @@ -22777,8 +22731,8 @@ "aUp" = ( /obj/structure/table, /obj/item/toy/cards, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/simulated/floor, /area/crew_quarters/locker) @@ -22788,8 +22742,8 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/simulated/floor, /area/crew_quarters/locker) @@ -23244,9 +23198,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /turf/simulated/floor/plating, /area/supply/storage) "aVe" = ( @@ -32600,7 +32551,6 @@ /turf/simulated/floor, /area/hallway/primary/port) "blg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposaloutlet{ dir = 4 }, @@ -35883,7 +35833,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/simulated/floor/plating, /area/supply/office) "bra" = ( @@ -35920,21 +35869,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/supply/office) -"brd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor/plating, -/area/hallway/primary/port) "bre" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -126846,15 +126780,6 @@ icon_state = "dark" }, /area/security/warden) -"nqn" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/simulated/floor, -/area/crew_quarters/locker) "nrq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -227988,7 +227913,7 @@ bjK blr bnh bpp -brd +bhX bto bvA bxH @@ -253573,7 +253498,7 @@ aCc aCc aCc aOg -aPB +aPA aRm aRg aUo @@ -254075,7 +254000,7 @@ aJQ aLq aCc aOf -aPB +aPA aRl aRi jeC @@ -254577,9 +254502,9 @@ aGY aLs aCc aOi -aPC -nqn -aSJ +aPz +aUj +aRk aUq aUn aWM @@ -255079,9 +255004,9 @@ aJR aLr aCc aOh -aPC -nqn -aSJ +aPz +aUj +aRk aUp aUn aWM From e3ed60a77a9450cd206890b2b75a3a5497a8d556 Mon Sep 17 00:00:00 2001 From: kernikov Date: Sat, 26 Oct 2024 17:57:28 -0500 Subject: [PATCH 3/4] forgot dorms decals forgot dorms decals --- maps/metaclub.dmm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm index 30281f9e9e5e..024a0b69f14e 100644 --- a/maps/metaclub.dmm +++ b/maps/metaclub.dmm @@ -19170,10 +19170,16 @@ /obj/machinery/status_display{ pixel_y = 30 }, +/obj/effect/decal/warning_stripes{ + icon_state = "bot" + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOg" = ( /obj/machinery/portable_atmospherics/pump, +/obj/effect/decal/warning_stripes{ + icon_state = "bot" + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOh" = ( @@ -19185,10 +19191,16 @@ dir = 1 }, /obj/machinery/portable_atmospherics/scrubber, +/obj/effect/decal/warning_stripes{ + icon_state = "bot" + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOi" = ( /obj/machinery/portable_atmospherics/scrubber, +/obj/effect/decal/warning_stripes{ + icon_state = "bot" + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOj" = ( From 8660db3bc4d8281a4b18d834be3e8a3363e6011c Mon Sep 17 00:00:00 2001 From: kernikov Date: Fri, 1 Nov 2024 00:05:03 -0500 Subject: [PATCH 4/4] more things re-added connector ports for scrubbers and air pumps in dorms, removed duplicate captain stamp, added light to virology external airlock, remove dead end manifolds in dorms, removed extra vent from cryo area, tweaked pipes in morgue --- maps/metaclub.dmm | 248 ++++++++++++++++++++++++++++++---------------- 1 file changed, 165 insertions(+), 83 deletions(-) diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm index 024a0b69f14e..ca88a2c77f92 100644 --- a/maps/metaclub.dmm +++ b/maps/metaclub.dmm @@ -11923,14 +11923,12 @@ /turf/simulated/floor, /area/crew_quarters/sleep) "aAN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/simulated/floor{ - dir = 6 +/obj/item/weapon/stool{ + pixel_y = 8 }, -/area/medical/cryo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor, +/area/crew_quarters/locker) "aAO" = ( /obj/effect/spawner/lootdrop{ loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/trash/cigbutt","/obj/item/trash/chips/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); @@ -19173,6 +19171,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOg" = ( @@ -19180,6 +19181,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOh" = ( @@ -19194,6 +19198,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOi" = ( @@ -19201,6 +19208,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "bot" }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, /turf/simulated/floor, /area/crew_quarters/locker) "aOj" = ( @@ -20073,9 +20083,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/simulated/floor{ dir = 4; icon_state = "neutralcorner" @@ -22743,9 +22751,7 @@ "aUp" = ( /obj/structure/table, /obj/item/toy/cards, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/simulated/floor, /area/crew_quarters/locker) "aUq" = ( @@ -22754,9 +22760,7 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/simulated/floor, /area/crew_quarters/locker) "aUr" = ( @@ -22773,9 +22777,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/simulated/floor{ icon_state = "neutralcorner" }, @@ -38729,7 +38731,6 @@ }) "bwd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/captain, /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/wood, /area/crew_quarters/captain{ @@ -52824,9 +52825,6 @@ name = "Medbay - Cryogenics"; network = list("SS13","Medbay") }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/sleeper/mancrowave, /turf/simulated/floor{ dir = 6 @@ -64633,9 +64631,6 @@ /obj/structure/table, /obj/item/weapon/storage/box/bodybags, /obj/item/weapon/pen, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor{ icon_state = "dark" }, @@ -67330,8 +67325,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/simulated/floor{ dir = 6 @@ -75051,11 +75046,14 @@ name = "\improper Toxins Lab" }) "cGm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ dir = 8; name = "Aft (S) Primary Hallway - S" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor{ dir = 4; icon_state = "purplecorner" @@ -75468,8 +75466,8 @@ }, /area/medical/morgue) "cGT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - req_access_txt = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/simulated/floor{ dir = 1; @@ -75961,6 +75959,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ dir = 8; icon_state = "whitehall" @@ -75985,6 +75986,9 @@ req_one_access_txt = "5;500" }, /obj/machinery/holosign/morgue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -76015,7 +76019,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /turf/simulated/floor{ icon_state = "white" }, @@ -76058,6 +76064,11 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + external_pressure_bound = 101; + on = 1 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -76074,6 +76085,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -76103,22 +76117,22 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, /area/medical/morgue) "cHW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/simulated/floor{ - dir = 8; - icon_state = "neutralcorner" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/hallway/primary/aft) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor, +/area/crew_quarters/locker) "cHX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -76129,19 +76143,23 @@ /obj/structure/table, /obj/item/weapon/folder/white, /obj/item/clothing/gloves/latex, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/simulated/floor{ icon_state = "dark" }, /area/medical/morgue) "cHZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/simulated/wall, -/area/medical/morgue) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/simulated/floor{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) "cIa" = ( /turf/simulated/floor{ dir = 8 @@ -76662,8 +76680,11 @@ }, /area/medical/morgue) "cIS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + req_access_txt = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/simulated/floor, /area/hallway/primary/aft) @@ -76685,6 +76706,9 @@ req_one_access_txt = "5;6;500" }, /obj/machinery/holosign/morgue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/simulated/floor{ icon_state = "dark" }, @@ -77252,9 +77276,6 @@ }, /area/medical/morgue) "cJS" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -77999,9 +78020,13 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cKX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/simulated/wall, -/area/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/simulated/floor{ + dir = 6 + }, +/area/medical/cryo) "cKY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -78460,14 +78485,15 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cLM" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/simulated/floor/plating, -/area/maintenance/aft) +/turf/simulated/floor{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) "cLN" = ( /turf/simulated/floor{ dir = 4; @@ -125370,6 +125396,17 @@ /area/security/gas_chamber{ name = "Firing Range" }) +"git" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/simulated/floor{ + icon_state = "dark" + }, +/area/medical/morgue) "gkA" = ( /obj/effect/decal/warning_stripes{ icon_state = "unloading" @@ -126677,6 +126714,17 @@ "mOq" = ( /turf/simulated/floor/carpet, /area/security/main) +"mTs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/simulated/floor{ + icon_state = "dark" + }, +/area/medical/morgue) "mTU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -127014,6 +127062,18 @@ }, /turf/simulated/floor/shuttle/plating, /area/shuttle/escape/centcom) +"ous" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/simulated/floor{ + icon_state = "dark" + }, +/area/medical/morgue) "ovb" = ( /obj/machinery/atmospherics/unary/vent_pump{ on = 1 @@ -128798,6 +128858,12 @@ icon_state = "red" }, /area/security/brig) +"wbB" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/virology_maint) "wfk" = ( /obj/machinery/light{ dir = 8 @@ -129002,6 +129068,22 @@ /area/security/gas_chamber{ name = "Firing Range" }) +"wYS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/simulated/floor{ + icon_state = "dark" + }, +/area/medical/morgue) "xbF" = ( /obj/structure/closet/wardrobe/orange, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -216941,7 +217023,7 @@ cMl cMQ cKt cOw -cKt +wbB cKt cOw aaO @@ -228965,8 +229047,8 @@ cnD coU cqo crp -crp -aAN +cKX +iCI bVj coT cxc @@ -235506,7 +235588,7 @@ wOV cET cFT cGV -cHP +wYS cGV cGV cET @@ -238519,7 +238601,7 @@ cEX cFV cEV cHS -cHU +mTs cJR cET bXm @@ -239021,10 +239103,10 @@ cEX cFW cEV cpG -cHU +git cJS -cKX -cLM +cET +bXm cMz cNi cOc @@ -239523,7 +239605,7 @@ cEY cFV cEV cHY -cHV +ous cJV cET bXm @@ -240024,7 +240106,7 @@ cxn cxn cxn cEV -cHZ +cET cIU cET cET @@ -240526,7 +240608,7 @@ cCG clz cFX cnT -cHW +cnT cIS cGT cHN @@ -241028,10 +241110,10 @@ cDZ cDZ cDZ cDZ +cDZ cHX cIT cDZ -cDZ cLO cMB cNl @@ -241530,7 +241612,7 @@ cEd cEZ cjc crP -chV +cjc cGm cJY cxr @@ -253510,7 +253592,7 @@ aCc aCc aCc aOg -aPA +cLM aRm aRg aUo @@ -254012,7 +254094,7 @@ aJQ aLq aCc aOf -aPA +cLM aRl aRi jeC @@ -254514,9 +254596,9 @@ aGY aLs aCc aOi -aPz -aUj -aRk +cHZ +cHW +aAN aUq aUn aWM @@ -255016,9 +255098,9 @@ aJR aLr aCc aOh -aPz -aUj -aRk +cHZ +cHW +aAN aUp aUn aWM