From cf177bd4150b04b0e5129eccd27c3ff870a2f6d8 Mon Sep 17 00:00:00 2001 From: Sara Date: Tue, 12 Nov 2024 17:10:48 -0700 Subject: [PATCH] Ladder and disposal fix --- .../icemaint_east/icemaint_east_boring.dmm | 59 +++-- .../icemaint_east/icemaint_east_danger.dmm | 74 +++---- .../icemaint_east/icemaint_east_icering.dmm | 130 ++++++----- .../icemaint_east/icemaint_east_knotways.dmm | 89 ++++---- .../icemaint_east/icemaint_east_maze.dmm | 59 +++-- .../Smexistation/Snaxi_Splurt_v2.dmm | 207 ++++++++++-------- 6 files changed, 317 insertions(+), 301 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_boring.dmm b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_boring.dmm index 1953a77dbf34..dc0208450808 100644 --- a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_boring.dmm +++ b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_boring.dmm @@ -353,7 +353,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/service/lower"; - dir = 4; name = "Lower East Engineering Post APC"; pixel_x = -24 }, @@ -493,10 +492,6 @@ "Rl" = ( /turf/open/floor/plating/snowed/smoothed/warmer, /area/maintenance/central/frozen/upper) -"RO" = ( -/obj/structure/ladder, -/turf/open/floor/plating/snowed/smoothed/warmer, -/area/maintenance/central/frozen/upper) "RR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -1822,9 +1817,9 @@ CT CT CT CT -CT -Vf -Vf +iW +iW +iW WA PQ qV @@ -1854,12 +1849,12 @@ CT CT CT CT -CT -Vf -Vf -Vf iW -RO +Rl +Rl +Rl +Rl +Rl Sf Rl Rl @@ -1886,10 +1881,10 @@ CT CT CT CT -CT -Vf -Vf -Vf +iW +Rl +Rl +Rl iW iW iW @@ -1918,11 +1913,11 @@ CT CT CT CT -CT -CT -Vf -Vf -Vf +iW +Rl +Rl +Rl +iW Vf Vf Vf @@ -1950,11 +1945,11 @@ CT CT CT CT -CT -CT -Vf -Vf -Vf +iW +Rl +Rl +Rl +iW Vf Vf Vf @@ -1982,11 +1977,11 @@ CT CT CT CT -CT -CT -CT -CT -CT +iW +Rl +Rl +Rl +iW CT CT CT diff --git a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_danger.dmm b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_danger.dmm index 15719231b581..d4848c3c97a2 100644 --- a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_danger.dmm +++ b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_danger.dmm @@ -285,10 +285,6 @@ }, /turf/open/floor/plating, /area/engineering/substation/service/lower) -"ut" = ( -/obj/structure/ladder, -/turf/open/floor/plating/snowed/smoothed/warmer, -/area/maintenance/central/frozen/upper) "vG" = ( /obj/structure/chair/sofa/corp/left{ dir = 4 @@ -380,7 +376,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/service/lower"; - dir = 4; name = "Lower East Engineering Post APC"; pixel_x = -24 }, @@ -747,6 +742,9 @@ }, /turf/open/floor/wood/shadow, /area/maintenance/central/frozen/upper) +"ZP" = ( +/turf/closed/wall/mineral/snow, +/area/maintenance/central/frozen/upper) "ZR" = ( /obj/machinery/atmospherics/pipe/simple/violet/hidden{ dir = 6 @@ -2007,9 +2005,9 @@ Ot Ot Ot Ot -Ot -Yi -Yi +ZP +ZP +ZP BX nI sd @@ -2039,12 +2037,12 @@ Ot Ot Ot Ot -Ot -Yi -Yi -Yi -YA -ut +ZP +td +td +td +td +td JH td td @@ -2071,15 +2069,15 @@ Ot Ot Ot Ot -Ot -Yi -Yi -Yi -YA -YA -YA -YA -YA +ZP +td +td +td +ZP +ZP +ZP +ZP +ZP YA YA YA @@ -2103,11 +2101,11 @@ Ot Ot Ot Ot -Ot -Ot -Yi -Yi -Yi +ZP +td +td +td +ZP Yi Yi Yi @@ -2135,11 +2133,11 @@ Ot Ot Ot Ot -Ot -Ot -Yi -Yi -Yi +ZP +td +td +td +ZP Yi Yi Yi @@ -2167,11 +2165,11 @@ Ot Ot Ot Ot -Ot -Ot -Ot -Ot -Ot +ZP +td +td +td +ZP Ot Ot Ot diff --git a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_icering.dmm b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_icering.dmm index b30f54647a72..be926740cded 100644 --- a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_icering.dmm +++ b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_icering.dmm @@ -9,6 +9,9 @@ }, /turf/open/floor/plating/snowed/smoothed/warmer, /area/space) +"ap" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/underground/unexplored/rivers) "au" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -116,6 +119,9 @@ }, /turf/open/floor/plating/snowed/smoothed/warmer, /area/space) +"hF" = ( +/turf/closed/wall/mineral/snow, +/area/maintenance/central/frozen/upper) "hO" = ( /turf/open/floor/plating/snowed/smoothed/warmer, /area/space) @@ -229,6 +235,10 @@ /obj/machinery/door/window/westleft, /turf/open/floor/plating/ice/temperate, /area/space) +"pB" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/substation/service/lower) "pI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -238,6 +248,9 @@ }, /turf/open/floor/plasteel, /area/space) +"pM" = ( +/turf/closed/wall/r_wall, +/area/engineering/substation/service/lower) "pS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/snowed/smoothed/warmer, @@ -304,7 +317,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/service/lower"; - dir = 4; name = "Lower East Engineering Post APC"; pixel_x = -24 }, @@ -390,10 +402,6 @@ }, /turf/open/floor/plating/snowed/smoothed/warmer, /area/space) -"BG" = ( -/obj/structure/ladder, -/turf/open/floor/plating/snowed/smoothed/warmer, -/area/space) "BM" = ( /turf/open/floor/carpet/arcade, /area/space) @@ -527,7 +535,7 @@ "IE" = ( /obj/effect/spawner/lootdrop/tool_box, /turf/open/floor/plating/snowed/smoothed/warmer, -/area/space) +/area/maintenance/central/frozen/upper) "IN" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -639,7 +647,7 @@ /area/space) "OF" = ( /turf/closed/wall, -/area/space) +/area/engineering/substation/service/lower) "OJ" = ( /obj/structure/window/spawner/west, /obj/machinery/computer/arcade{ @@ -647,6 +655,9 @@ }, /turf/open/floor/carpet/arcade, /area/space) +"OP" = ( +/turf/open/floor/plating/snowed/smoothed/warmer, +/area/maintenance/central/frozen/upper) "Pk" = ( /obj/structure/closet/cabinet, /obj/item/clothing/suit/hooded/wintercoat, @@ -665,6 +676,9 @@ /obj/structure/bonfire/prelit, /turf/open/floor/plating/snowed/smoothed/warmer, /area/space) +"Qi" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/surface/outdoors) "Qj" = ( /obj/item/radio/intercom{ pixel_x = -30 @@ -2047,14 +2061,14 @@ UI UI UI UI -UI -UI -UI -GF +hF +hF +hF +pM OF -oC -oC -oC +pB +pB +pB OF hO hO @@ -2079,15 +2093,15 @@ UI UI UI UI -UI -UI -UI -UI -Ge -BG +hF +OP +OP +OP +OP +OP IE -hO -hO +OP +OP hO hO Ge @@ -2111,15 +2125,15 @@ UI UI UI UI -UI -UI -UI -UI -Ge -Ge -Ge -Ge -Ge +hF +OP +OP +OP +hF +hF +hF +hF +hF Ge Ge Ge @@ -2143,15 +2157,15 @@ UI UI UI UI -UI -UI -UI -UI -UI -UI -UI -UI -UI +hF +OP +OP +OP +hF +Qi +Qi +Qi +Qi UI UI UI @@ -2175,15 +2189,15 @@ UI UI UI UI -UI -UI -UI -UI -UI -UI -UI -UI -UI +hF +OP +OP +OP +hF +Qi +Qi +Qi +Qi UI UI UI @@ -2207,15 +2221,15 @@ UI UI UI UI -UI -UI -UI -UI -UI -UI -UI -UI -UI +hF +OP +OP +OP +hF +ap +ap +ap +ap UI UI UI diff --git a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_knotways.dmm b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_knotways.dmm index 05cf37b36606..8d236215d5c7 100644 --- a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_knotways.dmm +++ b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_knotways.dmm @@ -151,6 +151,9 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/substation/service/lower) +"jk" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/surface/outdoors) "jm" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -702,10 +705,6 @@ }, /turf/open/floor/plating, /area/engineering/substation/service/lower) -"Fm" = ( -/obj/structure/ladder, -/turf/open/floor/plating/snowed/smoothed/warmer, -/area/maintenance/central/frozen/upper) "FC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -909,7 +908,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/service/lower"; - dir = 4; name = "Lower East Engineering Post APC"; pixel_x = -24 }, @@ -953,6 +951,9 @@ color = "#cc0000" }, /area/maintenance/central/frozen/upper) +"Uj" = ( +/turf/closed/mineral/random/snow, +/area/icemoon/underground/unexplored/rivers) "UO" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -2335,9 +2336,9 @@ RM RM RM RM -RM -RM -RM +ax +ax +ax kJ YE gu @@ -2367,12 +2368,12 @@ RM RM RM RM -RM -RM -RM -RM ax -Fm +kz +kz +kz +kz +kz qp kz kz @@ -2399,10 +2400,10 @@ RM RM RM RM -RM -RM -RM -RM +ax +kz +kz +kz ax ax ax @@ -2431,15 +2432,15 @@ RM RM RM RM -RM -RM -RM -RM -RM -RM -RM -RM -RM +ax +kz +kz +kz +ax +jk +jk +jk +jk RM RM RM @@ -2463,15 +2464,15 @@ RM RM RM RM -RM -RM -RM -RM -RM -RM -RM -RM -RM +ax +kz +kz +kz +ax +jk +jk +jk +jk RM RM RM @@ -2495,15 +2496,15 @@ RM RM RM RM -RM -RM -RM -RM -RM -RM -RM -RM -RM +ax +kz +kz +kz +ax +Uj +Uj +Uj +Uj RM RM RM diff --git a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_maze.dmm b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_maze.dmm index 34035f9be37a..5fa47f27112f 100644 --- a/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_maze.dmm +++ b/_maps/RandomRuins/StationRuins/maint/icemaint_east/icemaint_east_maze.dmm @@ -54,7 +54,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/service/lower"; - dir = 4; name = "Lower East Engineering Post APC"; pixel_x = -24 }, @@ -340,10 +339,6 @@ }, /turf/open/floor/plating, /area/engineering/substation/service/lower) -"vp" = ( -/obj/structure/ladder, -/turf/open/floor/plating/snowed/smoothed/warmer, -/area/maintenance/central/frozen/upper) "wb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/snowed/smoothed/warmer, @@ -2210,9 +2205,9 @@ Pe Pe Pe Pe -Pe -oe -oe +Ys +Ys +Ys qF UW jZ @@ -2242,12 +2237,12 @@ Pe Pe Pe Pe -Pe -oe -oe -oe Ys -vp +em +em +em +em +em YG em em @@ -2274,10 +2269,10 @@ Pe Pe Pe Pe -Pe -oe -oe -oe +Ys +em +em +em Ys Ys Ys @@ -2306,11 +2301,11 @@ Pe Pe Pe Pe -Pe -Pe -oe -oe -oe +Ys +em +em +em +Ys oe oe oe @@ -2338,11 +2333,11 @@ Pe Pe Pe Pe -Pe -Pe -oe -oe -oe +Ys +em +em +em +Ys oe oe oe @@ -2370,11 +2365,11 @@ Pe Pe Pe Pe -Pe -Pe -Pe -Pe -Pe +Ys +em +em +em +Ys Pe Pe Pe diff --git a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt_v2.dmm b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt_v2.dmm index 873774dced55..b8773bc1d9d0 100644 --- a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt_v2.dmm +++ b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt_v2.dmm @@ -1005,7 +1005,6 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/commandsec/upper"; - dir = 4; name = "Upper Southern Engineering Post APC"; pixel_x = -24 }, @@ -6613,6 +6612,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/mine/production) +"chZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "cia" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7299,6 +7307,13 @@ /obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/service/chapel/main/monastery) +"ctA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engineering/substation/service/upper) "ctG" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -12690,9 +12705,8 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "ecV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) @@ -13324,7 +13338,6 @@ /turf/open/floor/carpet, /area/hallway/primary/central) "eqH" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -13629,7 +13642,6 @@ /turf/open/floor/plasteel, /area/science) "evP" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/junction{ dir = 1 }, @@ -13786,10 +13798,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"ezE" = ( -/obj/structure/ladder, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ezH" = ( /obj/machinery/computer/shuttle/snow_taxi, /obj/machinery/light{ @@ -16480,7 +16488,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/solars/port/fore) "fBi" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -18064,17 +18071,6 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) -"gco" = ( -/obj/machinery/camera{ - c_tag = "Northwestern Engineering Post"; - dir = 1 - }, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk/multiz/down{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engineering/substation/service/upper) "gcu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18110,9 +18106,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/substation/service/upper) "gdo" = ( @@ -21274,6 +21267,10 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"hhW" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "hic" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -21351,12 +21348,12 @@ /turf/open/floor/carpet, /area/command/heads_quarters/hos) "hjH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_x = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/substation/service/upper) "hjU" = ( @@ -23007,7 +23004,6 @@ /turf/open/floor/plating, /area/maintenance/department/science) "hKY" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 @@ -26758,6 +26754,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/cargo/storage) +"jdK" = ( +/turf/open/floor/plating, +/area/engineering/substation/service/upper) "jdY" = ( /obj/structure/table, /obj/item/storage/secure/briefcase/permits, @@ -29621,6 +29620,9 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "jYx" = ( @@ -34209,9 +34211,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/engineering/substation/service/upper) "lAp" = ( @@ -37853,7 +37852,7 @@ dir = 4; icon_state = "stairs_t" }, -/turf/closed/mineral/random/snow/underground, +/turf/open/space/basic, /area/maintenance/central/frozen/lower) "mMt" = ( /obj/effect/turf_decal/tile/yellow{ @@ -38803,13 +38802,6 @@ }, /turf/open/floor/plasteel/dark, /area/security) -"ncg" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard/aft) "nci" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/airalarm{ @@ -39745,9 +39737,6 @@ /obj/machinery/atmospherics/components/binary/valve/digital/on{ name = "Digital Valve" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/engineering/substation/service/upper) "nsh" = ( @@ -40618,6 +40607,9 @@ /area/maintenance/aft/secondary) "nGL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/substation/commandsec/upper) "nGX" = ( @@ -43729,7 +43721,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/engineering/substation/commandsec/lower"; - dir = 4; name = "Lower Southern Engineering Post APC"; pixel_x = -24 }, @@ -44062,9 +44053,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "oSG" = ( @@ -44335,9 +44324,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/substation/service/upper) "oYm" = ( @@ -44596,7 +44582,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) @@ -44797,6 +44783,17 @@ "pgT" = ( /turf/open/floor/wood, /area/medical/psychology) +"pgU" = ( +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Northwestern Engineering Post"; + dir = 1 + }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engineering/substation/service/upper) "phk" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -46034,7 +46031,6 @@ "pEB" = ( /obj/machinery/power/apc{ areastring = "/area/engineering/substation/commandsec/lower"; - dir = 4; name = "Upper East Engineering Post APC"; pixel_x = -24 }, @@ -50769,7 +50765,7 @@ dir = 1 }, /obj/machinery/light, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, @@ -52770,6 +52766,9 @@ /obj/machinery/atmospherics/components/binary/valve/digital/on{ name = "Digital Valve" }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/substation/commandsec/upper) "rOb" = ( @@ -52807,9 +52806,6 @@ pixel_y = 21; pixel_x = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "rOV" = ( @@ -53550,6 +53546,11 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"scf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard/aft) "sct" = ( /obj/structure/cable{ icon_state = "2-4" @@ -54328,7 +54329,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/port/fore) "srE" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -54351,7 +54351,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard/fore) "srY" = ( -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, @@ -54360,6 +54360,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/office) "ssO" = ( @@ -55117,8 +55118,13 @@ /turf/open/floor/engine, /area/science/xenobiology) "sHA" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/engineering/substation/service/upper) "sHE" = ( @@ -57439,6 +57445,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/office) "ttI" = ( @@ -61515,6 +61522,7 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/starboard/aft) "uKK" = ( @@ -62915,6 +62923,11 @@ /obj/machinery/power/apc/auto_name/north, /turf/open/floor/plasteel, /area/science) +"vmO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "vmQ" = ( /obj/structure/chair/sofa/right, /turf/open/floor/plasteel/grimy, @@ -186952,10 +186965,10 @@ itW itW itW itW -itW -itW -itW -itW +uBi +tKi +uBi +uBi itW itW itW @@ -187209,10 +187222,10 @@ itW itW itW itW -itW -itW -itW -itW +uBi +jOR +jOR +uBi itW itW itW @@ -187466,10 +187479,10 @@ uBi oeW uBi uBi -itW -itW -itW -itW +uBi +jOR +jOR +uBi itW itW itW @@ -187723,10 +187736,10 @@ med med med uBi -itW -itW -itW -itW +jOR +jOR +jOR +uBi itW itW itW @@ -187980,9 +187993,9 @@ med iEh hGk uBi -uBi -uBi -uBi +jOR +jOR +jOR uBi itW itW @@ -248877,13 +248890,13 @@ xuH tVp wBf krX -krX +scf uKD -krX +scf krX evP srE -ncg +obu jWm xnk lew @@ -248894,12 +248907,12 @@ wNg rZA qxF eim +rjV ltX qUz qUz qUz qUz -qUz nQP nQP nQP @@ -249152,10 +249165,10 @@ pXu chi eKi rOP +chZ ozu jWu dNR -hWd qUz nQP nQP @@ -249408,15 +249421,15 @@ iXj npg bHk npg +npg huQ huQ -npg +vQQ qpt nQP nQP nQP nQP -nQP dxG dxG dxG @@ -249667,12 +249680,12 @@ nzJ pEB oYj hjH -npg +wPO +vQQ qpt nQP nQP nQP -nQP dxG dxG dxG @@ -249924,11 +249937,11 @@ maX jVk gdg wPO -hqX +wPO +hhW qpt nQP nQP -nQP dxG dxG dxG @@ -250182,10 +250195,10 @@ haM lAj gZx sHA +vmO poE nQP nQP -nQP dxG dxG dxG @@ -250438,11 +250451,11 @@ hci rWy nse xOo -sHA +ctA +vmO qKQ nQP nQP -nQP dxG dxG dxG @@ -250693,10 +250706,10 @@ otp npg cxa ccN +jdK wZF -gco -hqX -nQP +pgU +hhW nQP nQP nQP @@ -250953,7 +250966,7 @@ jsK jsK jsK jsK -nQP +qqV nQP nQP nQP @@ -251206,7 +251219,7 @@ gvZ bxC ojB wZz -ezE +ojB swX iFc nQP