From 5eafa910fd978c307fa1ca4247253396c9dba011 Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Wed, 11 Aug 2021 12:15:10 -0400 Subject: [PATCH 1/4] Fix Delta's Port Side Disposals, adds adds a fireaxe --- _maps/map_files/Delta/delta.dmm | 1216 +++++++++++++------------------ 1 file changed, 488 insertions(+), 728 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e0924f274e8..b456b3115fd 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -20660,38 +20660,50 @@ }, /area/atmos) "aXX" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hallway/primary/central) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/atmos) "aXY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "aXZ" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "neutralfull" }, /area/hallway/primary/central) "aYa" = ( @@ -20976,13 +20988,15 @@ /area/crew_quarters/kitchen) "aYF" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/light{ dir = 8 }, /obj/machinery/light_switch{ pixel_x = -22 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -20990,6 +21004,10 @@ /area/atmos) "aYG" = ( /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -21330,12 +21348,11 @@ }, /area/quartermaster/office) "aZm" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "neutralcorner" }, -/area/hallway/primary/fore) +/area/hallway/primary/central) "aZn" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ @@ -21970,7 +21987,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "baq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -22108,9 +22124,6 @@ /turf/simulated/wall, /area/hydroponics) "baG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22821,22 +22834,15 @@ }, /area/atmos) "bbR" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/suit_storage_unit/atmos, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/atmos) "bbS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/landmark/start{ name = "Life Support Specialist" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -23940,13 +23946,12 @@ }, /area/hallway/primary/fore) "bec" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24200,6 +24205,9 @@ }, /obj/structure/closet/wardrobe/atmospherics_yellow, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/fireaxecabinet{ + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -24514,11 +24522,16 @@ }, /area/quartermaster/miningdock) "bfy" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/area/hallway/primary/central) +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/fore) "bfz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25022,10 +25035,6 @@ }, /area/hallway/primary/fore) "bgF" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25033,6 +25042,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25547,7 +25559,6 @@ }, /area/hallway/primary/fore) "bhP" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25560,6 +25571,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25588,6 +25602,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -25598,6 +25615,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25638,11 +25658,15 @@ }, /area/hallway/primary/fore) "bhX" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) +/turf/simulated/floor/plating, +/area/maintenance/fore) "bhY" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -26244,13 +26268,16 @@ }, /area/atmos) "biS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26278,6 +26305,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27127,36 +27158,30 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkG" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; + d1 = 1; + d2 = 2; + icon_state = "1-2"; tag = "" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/atmos) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) "bkH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/atmos) -"bkI" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"bkI" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -27167,10 +27192,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -27185,6 +27206,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27414,6 +27436,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -27428,6 +27453,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "bls" = ( @@ -27477,11 +27505,19 @@ }, /area/hallway/primary/fore) "blx" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "brown" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/area/hallway/primary/fore) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) "bly" = ( /obj/structure/chair{ dir = 1 @@ -29957,10 +29993,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "bqg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -29972,6 +30004,10 @@ icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "bqh" = ( @@ -30028,10 +30064,6 @@ }, /area/hallway/primary/central) "bqn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -30057,24 +30089,19 @@ }, /area/hallway/primary/central) "bqp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"bqq" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"bqq" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30090,26 +30117,16 @@ }, /area/hallway/primary/central) "bqr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plasteel, +/area/maintenance/fore) "bqs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30126,10 +30143,6 @@ }, /area/hallway/primary/central) "bqt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -30150,6 +30163,10 @@ codes_txt = "patrol;next_patrol=hall15"; location = "hall14" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30185,6 +30202,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30203,7 +30223,6 @@ /turf/simulated/floor/plating, /area/bridge) "bqz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30223,6 +30242,11 @@ codes_txt = "patrol;next_patrol=hall14"; location = "hall13" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Quartermaster Junction"; + sortType = 3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30233,6 +30257,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -30956,6 +30984,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "bsa" = ( @@ -31007,14 +31036,27 @@ }, /area/bridge) "bsf" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + dir = 4; + icon_state = "yellow" }, -/area/hallway/primary/central) +/area/engine/break_room) "bsg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31036,18 +31078,12 @@ }, /area/hallway/primary/central) "bsi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -31058,9 +31094,6 @@ }, /area/hallway/primary/central) "bsl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "Observer-Start" }, @@ -31069,17 +31102,11 @@ }, /area/hallway/primary/central) "bsm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/hallway/primary/central) "bsn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /obj/machinery/camera{ c_tag = "Central Ring Hallway North"; @@ -31098,9 +31125,6 @@ }, /area/library) "bsq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ dir = 8; @@ -31108,9 +31132,6 @@ }, /area/hallway/primary/central) "bsr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -31122,29 +31143,21 @@ }, /area/hallway/primary/central) "bst" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Quartermaster Junction"; - sortType = 3 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bsu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -31571,10 +31584,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btp" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31589,15 +31598,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "btq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31611,9 +31618,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31631,9 +31635,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bts" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31647,9 +31648,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31664,10 +31662,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -31769,20 +31763,20 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "btE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "neutralcorner" }, -/area/hallway/primary/central) +/area/bridge/meeting_room) "btF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32181,6 +32175,9 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, +/obj/structure/disposalpipe/sortjunction{ + name = "CE's Junction" + }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -32244,6 +32241,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/atmos) "buA" = ( @@ -32275,10 +32273,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "buE" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32293,19 +32287,15 @@ /turf/simulated/floor/plasteel, /area/atmos) "buF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) +/area/hallway/primary/central) "buG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/arrow{ dir = 1 }, @@ -32318,9 +32308,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "buH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -32332,9 +32319,6 @@ /turf/simulated/floor/plating, /area/atmos) "buI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -32344,7 +32328,6 @@ }, /area/hallway/primary/port) "buJ" = ( -/obj/structure/disposalpipe/junction, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32354,6 +32337,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -32451,24 +32435,33 @@ }, /area/hallway/primary/central) "buV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"buW" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"buW" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "buX" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -32869,6 +32862,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/atmos) "bvN" = ( @@ -33637,6 +33631,7 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxa" = ( @@ -34329,6 +34324,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "byz" = ( @@ -34501,25 +34497,26 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "byK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "byL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34573,10 +34570,6 @@ }, /area/hallway/primary/central) "byP" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34595,7 +34588,6 @@ }, /area/hallway/primary/central) "byQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -35137,6 +35129,7 @@ /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "bzW" = ( @@ -36000,6 +35993,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -36257,10 +36251,6 @@ /turf/simulated/wall, /area/storage/primary) "bCf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -36344,47 +36334,21 @@ }, /area/bridge) "bCi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bCj" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "vault" + icon_state = "neutralfull" }, -/area/bridge) +/area/hallway/primary/central) "bCk" = ( /obj/structure/cable{ d1 = 4; @@ -37305,7 +37269,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bDt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37318,6 +37281,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -37336,22 +37303,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) -"bDw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -37378,6 +37330,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37459,10 +37412,6 @@ }, /area/storage/tech) "bDG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37646,49 +37595,7 @@ }, /turf/simulated/floor/plating, /area/bridge) -"bDV" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "HoP Junction"; - sortType = 13 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) -"bDW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) -"bDX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bDY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -37697,10 +37604,6 @@ }, /area/bridge) "bDZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -38166,13 +38069,6 @@ icon_state = "caution" }, /area/engine/break_room) -"bEV" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" - }, -/area/engine/break_room) "bEW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -38210,6 +38106,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -38404,19 +38301,7 @@ icon_state = "neutralfull" }, /area/hallway/primary/central) -"bFt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" - }, -/area/hallway/primary/central) "bFu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable, /obj/machinery/door/poddoor{ @@ -38428,26 +38313,6 @@ }, /turf/simulated/floor/plating, /area/bridge) -"bFv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bFw" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) "bFx" = ( /obj/machinery/light_switch{ pixel_x = -8; @@ -38470,20 +38335,6 @@ icon_state = "darkblue" }, /area/bridge) -"bFA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "darkblue" - }, -/area/bridge) "bFB" = ( /obj/machinery/camera{ c_tag = "Bridge Port"; @@ -38881,6 +38732,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "bGs" = ( @@ -38970,19 +38824,7 @@ icon_state = "dark" }, /area/engine/gravitygenerator) -"bGC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) "bGD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/cans/starkist, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -38992,9 +38834,6 @@ }, /area/engine/break_room) "bGE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/pen, @@ -39005,9 +38844,6 @@ }, /area/engine/break_room) "bGF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/lightreplacer, @@ -39018,9 +38854,6 @@ }, /area/engine/break_room) "bGG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39039,6 +38872,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39507,7 +39344,6 @@ /turf/simulated/wall, /area/bridge/meeting_room) "bHl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -40104,21 +39940,16 @@ /area/crew_quarters/chief) "bIr" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -6; pixel_y = 32 }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/chief) "bIs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -40130,9 +39961,6 @@ }, /area/crew_quarters/chief) "bIt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ @@ -40144,9 +39972,6 @@ }, /area/crew_quarters/chief) "bIu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/rack, /obj/item/crowbar, /obj/item/storage/toolbox/mechanical, @@ -40158,9 +39983,6 @@ }, /area/crew_quarters/chief) "bIv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ pixel_y = 24 @@ -40170,9 +39992,6 @@ }, /area/crew_quarters/chief) "bIw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -40192,9 +40011,6 @@ }, /area/engine/break_room) "bIz" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -40226,6 +40042,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -40494,7 +40311,6 @@ }, /area/hallway/primary/central) "bJe" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; @@ -41024,11 +40840,18 @@ /area/crew_quarters/chief) "bKe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/chief) "bKf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -41040,6 +40863,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -41058,27 +40884,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/chief) -"bKi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"bKj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" - }, -/area/engine/break_room) "bKk" = ( /obj/structure/cable{ d1 = 4; @@ -41108,13 +40920,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/chief) "bKl" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -41127,15 +40938,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, /area/engine/break_room) "bKp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -41148,16 +40959,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bKq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41176,6 +40986,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + name = "CE's Junction"; + sortType = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -41280,6 +41095,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bKD" = ( @@ -41372,7 +41190,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bKL" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/phone, @@ -42279,9 +42096,6 @@ }, /area/storage/primary) "bML" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -42391,7 +42205,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bMS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -43283,7 +43096,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOJ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -43307,10 +43119,6 @@ }, /area/bridge/meeting_room) "bOL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44196,10 +44004,6 @@ }, /area/security/brig) "bQp" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 @@ -44402,7 +44206,6 @@ /turf/simulated/wall, /area/blueshield) "bQJ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -46706,10 +46509,6 @@ }, /area/crew_quarters/heads/hop) "bUR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/keycard_auth{ pixel_y = 26 @@ -46718,14 +46517,6 @@ icon_state = "wood" }, /area/crew_quarters/heads/hop) -"bUS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/crew_quarters/heads/hop) "bUT" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -48357,7 +48148,6 @@ }, /area/crew_quarters/heads/hop) "bYs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -48865,7 +48655,8 @@ /area/engine/engineering) "bZy" = ( /obj/structure/disposalpipe/sortjunction{ - name = "Engineering Junction" + name = "Engineering Junction"; + sortType = 4 }, /obj/structure/cable{ d1 = 1; @@ -49120,10 +48911,6 @@ icon_state = "dark" }, /area/crew_quarters/heads/hop) -"bZY" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads/hop) "caa" = ( /obj/structure/table/wood, /obj/machinery/light, @@ -52461,7 +52248,6 @@ }, /area/crew_quarters/heads/hop) "chh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /turf/simulated/floor/carpet, @@ -53084,7 +52870,6 @@ }, /area/crew_quarters/heads/hop) "ciD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 1 }, @@ -53967,7 +53752,6 @@ }, /area/crew_quarters/heads/hop) "ckq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -54781,7 +54565,6 @@ }, /area/crew_quarters/heads/hop) "clM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -55485,15 +55268,15 @@ /area/crew_quarters/heads/hop) "cnq" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55503,6 +55286,9 @@ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55516,6 +55302,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55531,7 +55321,6 @@ }, /area/crew_quarters/heads/hop) "cnv" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -56019,6 +55808,7 @@ req_access_txt = "57" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -56612,6 +56402,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -56640,6 +56433,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -56654,6 +56450,10 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -56929,14 +56729,6 @@ icon_state = "neutralcorner" }, /area/bridge/meeting_room) -"cqm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "cqn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59547,6 +59339,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -60683,6 +60476,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -63632,10 +63428,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cDR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -63647,33 +63439,7 @@ icon_state = "neutral" }, /area/maintenance/port) -"cDS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cDT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cDU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/port) "cDV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -63683,30 +63449,15 @@ }, /area/maintenance/port) "cDW" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "Library Junction"; - sortType = 17 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/port) "cDX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/maintenance/port) -"cDY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/port) "cDZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -63950,22 +63701,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cEE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cEH" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "cEK" = ( /obj/structure/cable{ d1 = 4; @@ -64855,10 +64590,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64875,6 +64606,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGo" = ( @@ -64891,6 +64625,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGp" = ( @@ -64906,6 +64643,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGq" = ( @@ -64924,6 +64664,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGr" = ( @@ -64937,6 +64680,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Library Junction"; + sortType = 16 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGs" = ( @@ -64951,6 +64700,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -64971,13 +64723,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGu" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64997,6 +64748,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGv" = ( @@ -65028,10 +64782,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cGx" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -65043,6 +64793,12 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "HoP Junction"; + sortType = 15 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -65067,6 +64823,9 @@ codes_txt = "patrol;next_patrol=hall6"; location = "hall5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -65634,10 +65393,6 @@ /turf/simulated/wall, /area/maintenance/port) "cHB" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -65650,15 +65405,16 @@ }, /area/hallway/primary/central) "cHC" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -102286,6 +102042,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -103095,6 +102854,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -103849,9 +103612,6 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "xqH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -128889,7 +128649,7 @@ bBA bDs bIx byl -bKi +bIx bKC bIx bGz @@ -129146,8 +128906,8 @@ bBB bLW bIy bGA -bKj -bLW +bIy +bsf bNT bGz bQk @@ -129401,7 +129161,7 @@ byt bzS bBC bDt -bEV +bIz bQp bIz bKl @@ -129659,7 +129419,7 @@ bBm bBE bDu bEW -bGC +bIA bIA bKp bMp @@ -129895,14 +129655,14 @@ aUc aVI aXp aYG -ban +bdr bbS bdr beM bgf bhn biS -bkG +bkF bmD bnY bpI @@ -129914,7 +129674,7 @@ bwX byv bzT bBE -bDw +bKp bEX bGD bIA @@ -130158,8 +129918,8 @@ bds beN aOb bhk -biT -bkH +aXX +bkF bmE bnZ bpJ @@ -130171,7 +129931,7 @@ byl byl byl bBF -bDw +bKp bEX bGE bEX @@ -130415,7 +130175,7 @@ aOb aXo aXo bho -biT +aXX bkI bmF boa @@ -130428,7 +130188,7 @@ bwY bOg bzW bBG -bDw +bKp bIA bGF bEX @@ -132221,7 +131981,7 @@ aOg btv btv btv -buF +buD bvQ ban byC @@ -134573,7 +134333,7 @@ czx cAS cAS cDR -cEE +cly cGn dmq cIM @@ -134829,7 +134589,7 @@ bYj bYj bYj bYj -cDS +drn dhG cGo dmq @@ -135086,7 +134846,7 @@ cxV czy bZK bYj -cDT +dhG dlM bGr dmq @@ -135343,9 +135103,9 @@ cxW crn cAT bYj -cDU +czF drn -deO +buW dmq cSq cKn @@ -135600,9 +135360,9 @@ cxX czA ctH bYj -cDS drn -deO +drn +buW dmq cIM cIM @@ -135857,9 +135617,9 @@ cxY czA cAU bYj -cDS +drn drs -deO +buW dmq cIL cIL @@ -136075,10 +135835,10 @@ aEu aMZ bqg brZ -aty -aty -apU -aIQ +bfy +bfy +bhX +bkG byJ bAl apU @@ -136114,9 +135874,9 @@ cxZ crn cAV bYj -cDS +drn dlM -deO +buW dmq cIO cIO @@ -136336,7 +136096,7 @@ baF baF baF baF -aDt +bkH bOC bOC bOC @@ -136371,7 +136131,7 @@ bAa ctO cAW bYj -cDT +dhG dmy cGp dmq @@ -136593,7 +136353,7 @@ bmQ buP bvZ baF -aDt +bkH bOC bBX bDP @@ -136850,7 +136610,7 @@ bkT buQ bwa baF -aDw +blx bOC bBY bDK @@ -136885,7 +136645,7 @@ cyb ctO cAY bYj -cDS +drn dlM bGr dmq @@ -137107,7 +136867,7 @@ bkU beU bwa baF -aEz +bqp bOC bBZ bDL @@ -137142,9 +136902,9 @@ bYj bYj cFM bYj -cDT +dhG drn -deO +buW dmq cIO cIO @@ -137400,7 +137160,7 @@ drn cDZ cCB cDW -drn +cDW cGr dmq dmq @@ -137878,7 +137638,7 @@ bmR beU bwa baF -byM +aEy bOC bCc bDN @@ -137913,7 +137673,7 @@ bYj czF cBb cHr -cDY +dlM drn cGt cHx @@ -138135,7 +137895,7 @@ bmU buR bwa baF -bpZ +aEz bOC bCd bDO @@ -138170,8 +137930,8 @@ bYj drn cHr drn -cDZ -cEH +drn +dhG cGu cHy cly @@ -138392,7 +138152,7 @@ btD buS bwb baF -bqe +aDt bOC bCg bDS @@ -138649,7 +138409,7 @@ bgp buT baF baF -btF +bqr bOC bCe bDQ @@ -138932,17 +138692,17 @@ bOW bOW cGC tVa -bOW -bOW -bOW +buF +buF +buF cvs -bOW -bOW -bOW -bOW -bOW -bOW -chc +buF +buF +buF +buF +buF +buF +buV cGx cHB bvV @@ -139158,13 +138918,13 @@ blc bmX bom bqn -buV -btE -buV -buV -buV +bva +bSi +bva +bva +bva byP -buV +bva bCf bva bFs @@ -139414,17 +139174,17 @@ bjo bld bmW boo -bqp -bsf -cqm -buW -buW -buW +bqu +bIX +bSz +bIX +bIX +bIX byQ -bfy +bWM bDG -bfy -bFt +bWM +bWM bHi bIX bIX @@ -139445,7 +139205,7 @@ ckm bIX bIX bSz -cpO +bst crr cEL ctQ @@ -139457,7 +139217,7 @@ cEL cEL cEL cEL -bqu +bCi cHC ddn cLZ @@ -139671,8 +139431,8 @@ bjp bQc aYZ boo -bqp -bsg +bqu +aZm bsv bvV bxi @@ -139928,17 +139688,17 @@ bjq blf aYZ boo -bqp -bqv +bqu +bIX bsv btH btH btH bwf bAr -bCi +bCl byU -bFv +bFR bHj bIY bKF @@ -139959,7 +139719,7 @@ ckn clI cno bSE -cpT +btE cry csK ctR @@ -140185,17 +139945,17 @@ bjt blg aYZ boo -bqp -bqv +bqu +bIX btH aaa abj aaa bwf bAs -bCj -bDV -bFw +bCB +bAs +bAs bHj bIZ bKN @@ -140216,7 +139976,7 @@ cko clJ cnp bSE -cpT +btE cry csK cBi @@ -140442,8 +140202,8 @@ bjs blh aYZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -140451,7 +140211,7 @@ aaa bwf aot bCk -bDW +bEk asz bHj bJa @@ -140699,8 +140459,8 @@ bjt blj aYZ bop -bqp -bqv +bqu +bIX btH aaa abj @@ -140708,7 +140468,7 @@ aaa bwf bAt bCl -bDX +byU bFx bHk bJb @@ -140730,7 +140490,7 @@ ckp clL bUT bSE -cpT +btE cry csK cEs @@ -140956,7 +140716,7 @@ aYC blk aYZ boo -bqp +bqu bsi bsv abj @@ -140965,7 +140725,7 @@ abj bwf bAu bCl -bDX +byU bFy bHk bJc @@ -140975,9 +140735,9 @@ bOI bQH ciB bUR -bZY +chi bYs -bZY +chi bYs cnv bYs @@ -141213,8 +140973,8 @@ aYE bll bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -141231,7 +140991,7 @@ bMQ bOF bKN ciB -bUS +bWR bWT cbT chi @@ -141244,7 +141004,7 @@ ckr clN cnr bSE -cpT +btE crw csK cEs @@ -141471,7 +141231,7 @@ blm bmZ boq bqq -bqv +bIX btH aaa abj @@ -141480,7 +141240,7 @@ bwf aos bCn bDZ -bFA +bFP bHl bJe bKL @@ -141727,8 +141487,8 @@ aYE blo bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -141984,7 +141744,7 @@ aZk bln aZa bor -bqr +dxV bsj bsv abj @@ -142241,8 +142001,8 @@ bjw bnc bmZ boo -bqp -bqv +bqu +bIX btH aaa bwc @@ -142498,8 +142258,8 @@ bdQ bne bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -142755,8 +142515,8 @@ bdP bQy bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -143012,8 +142772,8 @@ bjy bQy aYZ ibc -bqp -bqv +bqu +bIX btH aaa bwe @@ -143269,7 +143029,7 @@ bnb aYZ bna boo -bqp +bqu bsi bsv abj @@ -144040,7 +143800,7 @@ bhY bSB bMb bov -bqu +aXY bsm btH aaa @@ -144297,7 +144057,7 @@ bfq bdU bnd bov -bqu +aXY bsn bsv abj @@ -144554,8 +144314,8 @@ bjC bls bfq bov -bqu -ckH +aXY +bwm btH aaa bwj @@ -144811,8 +144571,8 @@ bfu blt bfq bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -145068,8 +144828,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -145325,8 +145085,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwl @@ -145582,7 +145342,7 @@ bfu blw bdU bgX -dxV +aXZ bML bsv abj @@ -145835,12 +145595,12 @@ bcB bfu bea bgF -aZm -blx -bhX -aXX +bfu +blu +bhU +bov aXY -aXZ +bwm btH aaa abj @@ -146097,7 +145857,7 @@ blu bhU box bqx -ckH +bwm btH aaa abj @@ -146353,8 +146113,8 @@ bfu bly bfq bov -bqu -ckH +aXY +bwm btH aaa abj @@ -146610,7 +146370,7 @@ bfu blz bfq bov -bqu +aXY bsq bsv abj @@ -146867,8 +146627,8 @@ bjF blA bdU boy -bqu -ckH +aXY +bwm btH aaa abj @@ -147124,8 +146884,8 @@ bbi bbe bbe boz -bqu -ckH +aXY +bwm btH aaa abj @@ -147381,8 +147141,8 @@ bjG blB bbe boy -bqu -ckH +aXY +bwm btH aaa abj @@ -147638,8 +147398,8 @@ bjH blN bbi bov -bqu -ckH +aXY +bwm bsv btH btH @@ -147895,7 +147655,7 @@ bfA bnf bNB cpO -bqu +aXY bsr bsv btI @@ -148152,8 +147912,8 @@ bjI bnh bbi bov -bqu -ckH +aXY +bwm coE bwm bwm @@ -148410,7 +148170,7 @@ blF bbe boB bqz -bst +bva bSi bva bva From c4327c58f611223058e887e2ab9ac16f23d63b97 Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Thu, 12 Aug 2021 14:41:09 -0400 Subject: [PATCH 2/4] Removed a stray sorting junction --- _maps/map_files/Delta/delta.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index b456b3115fd..aae476b6caa 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -32175,9 +32175,6 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, -/obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction" - }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, From b023cbc39d4c264474b3b03f8cbdab148c9d51f5 Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Fri, 13 Aug 2021 08:22:00 -0400 Subject: [PATCH 3/4] Updated to latest, which removed the sec checkpoints --- _maps/map_files/Delta/delta.dmm | 2518 ++++++++++++++----------------- 1 file changed, 1105 insertions(+), 1413 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index dbae276a6c9..5669dcfacb9 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -10740,7 +10740,6 @@ }, /area/maintenance/fore) "aEu" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10748,6 +10747,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fore) "aEv" = ( @@ -14957,13 +14957,13 @@ /turf/simulated/wall/rust, /area/maintenance/gambling_den) "aMZ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -15665,13 +15665,13 @@ }, /area/maintenance/gambling_den) "aOv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fore) "aOw" = ( @@ -20453,15 +20453,15 @@ }, /area/crew_quarters/bar) "aXJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -20555,40 +20555,54 @@ }, /area/atmos) "aXX" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" + dir = 8; + icon_state = "neutralfull" }, -/area/hallway/primary/central) +/area/hallway/primary/fore) "aXY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "aXZ" = ( -/obj/structure/disposalpipe/junction{ +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "neutralfull" }, -/area/hallway/primary/central) +/area/hallway/primary/fore) "aYa" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -20596,15 +20610,15 @@ }, /area/crew_quarters/kitchen) "aYc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20625,13 +20639,13 @@ }, /area/quartermaster/storage) "aYe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20870,14 +20884,16 @@ }, /area/crew_quarters/kitchen) "aYF" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/light{ dir = 8 }, /obj/machinery/light_switch{ pixel_x = -22 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution" @@ -20885,6 +20901,10 @@ /area/atmos) "aYG" = ( /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20973,16 +20993,16 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "aYQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -21007,12 +21027,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "aYT" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - name = "Hydroponics Junction"; - sortType = 21 - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -21036,14 +21050,17 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + icon_state = "pipe-j2s"; + name = "Hydroponics Junction"; + sortType = 21 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/maintenance/fore) "aYV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -21051,14 +21068,14 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/maintenance/fore) "aYW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -21068,12 +21085,12 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/turf/simulated/floor/plasteel, -/area/maintenance/fore) -"aYX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/fore) +"aYX" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -21082,16 +21099,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aYY" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -21106,6 +21122,10 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -21131,7 +21151,6 @@ }, /area/crew_quarters/bar) "aZc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -21139,6 +21158,7 @@ dir = 4; pixel_x = 28 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -21225,12 +21245,20 @@ }, /area/quartermaster/office) "aZm" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/hallway/primary/fore) +/area/atmos) "aZn" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ @@ -21256,12 +21284,12 @@ }, /area/quartermaster/storage) "aZp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -21290,6 +21318,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/office) "aZt" = ( @@ -21321,13 +21350,13 @@ }, /area/quartermaster/storage) "aZv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -21865,13 +21894,11 @@ /turf/simulated/floor/plasteel, /area/atmos) "baq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/atmos) "bar" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -21880,6 +21907,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -22003,9 +22031,6 @@ /turf/simulated/wall, /area/hydroponics) "baG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22020,7 +22045,6 @@ }, /area/hallway/primary/central) "baH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22031,6 +22055,7 @@ name = "Hydroponics Maintenance"; req_access_txt = "35" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "baI" = ( @@ -22196,12 +22221,12 @@ }, /area/quartermaster/office) "baX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -22716,22 +22741,15 @@ }, /area/atmos) "bbR" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/suit_storage_unit/atmos, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/atmos) "bbS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/landmark/start{ name = "Life Support Specialist" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -22817,7 +22835,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bce" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22825,6 +22842,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hydroponics) "bcf" = ( @@ -23062,9 +23080,9 @@ }, /area/quartermaster/miningdock) "bcF" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -23140,17 +23158,16 @@ }, /area/hallway/primary/fore) "bcN" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bcO" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Dock"; @@ -23158,6 +23175,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bcP" = ( @@ -23439,12 +23457,12 @@ }, /area/hydroponics) "bdy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greenblue" @@ -23715,12 +23733,12 @@ }, /area/crew_quarters/kitchen) "bdO" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/machinery/light{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -23788,10 +23806,10 @@ }, /area/hallway/primary/fore) "bdX" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -23835,13 +23853,12 @@ }, /area/hallway/primary/fore) "bec" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -23894,13 +23911,13 @@ }, /area/hydroponics) "bek" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -23955,7 +23972,6 @@ /turf/simulated/wall/r_wall, /area/security/medbay) "bey" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -23967,6 +23983,7 @@ name = "Mining Dock"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bez" = ( @@ -24082,8 +24099,8 @@ }, /area/atmos) "beM" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24169,11 +24186,11 @@ }, /area/hydroponics) "beW" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, @@ -24357,9 +24374,9 @@ }, /area/hallway/primary/fore) "bft" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24409,15 +24426,26 @@ }, /area/quartermaster/miningdock) "bfy" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "bluecorner" + dir = 8; + icon_state = "neutralfull" }, /area/hallway/primary/central) "bfz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bfA" = ( @@ -24452,13 +24480,13 @@ }, /area/hallway/primary/port) "bfF" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24696,12 +24724,12 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bgf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Storage"; req_one_access_txt = "24; 10" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24790,12 +24818,12 @@ /turf/simulated/wall, /area/hydroponics) "bgq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Hydroponics"; req_access_txt = "35" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hydroponics) "bgr" = ( @@ -24838,7 +24866,6 @@ }, /area/crew_quarters/kitchen) "bgw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -24849,6 +24876,7 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24901,9 +24929,6 @@ }, /area/hallway/primary/fore) "bgE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24911,16 +24936,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bgF" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-y" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24928,6 +24952,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24941,9 +24968,6 @@ }, /area/hallway/primary/fore) "bgH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24951,6 +24975,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25032,13 +25059,13 @@ }, /area/storage/primary) "bgR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bgS" = ( @@ -25310,19 +25337,19 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bhx" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) "bhy" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hydroponics) "bhz" = ( @@ -25442,7 +25469,6 @@ }, /area/hallway/primary/fore) "bhP" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25455,6 +25481,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25483,6 +25512,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -25493,6 +25525,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25518,26 +25553,26 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bhW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bhX" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "bhY" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -25557,42 +25592,39 @@ }, /area/quartermaster/miningdock) "bia" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/quartermaster/miningdock) "bib" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"bic" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"bid" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) +"bic" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) +"bid" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -25605,12 +25637,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"bie" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) +"bie" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -25621,6 +25653,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -25640,10 +25675,6 @@ }, /area/quartermaster/miningdock) "big" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -25657,6 +25688,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -25682,7 +25717,6 @@ }, /area/quartermaster/miningdock) "bii" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25701,6 +25735,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26139,13 +26174,16 @@ }, /area/atmos) "biS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26173,6 +26211,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26260,7 +26302,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore) "bjd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -26268,6 +26309,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -26468,12 +26510,6 @@ }, /area/hallway/primary/fore) "bjB" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j2s"; - name = "Kitchen Junction"; - sortType = 21 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -26482,6 +26518,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Kitchen Junction"; + sortType = 21 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26562,13 +26604,13 @@ }, /area/quartermaster/miningdock) "bjM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -27022,36 +27064,28 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkG" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; + d1 = 1; + d2 = 2; + icon_state = "1-2"; tag = "" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/atmos) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) "bkH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/atmos) +/area/maintenance/fore) "bkI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -27062,10 +27096,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -27080,6 +27110,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27309,6 +27340,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -27323,6 +27357,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "bls" = ( @@ -27372,11 +27409,27 @@ }, /area/hallway/primary/fore) "blx" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "brown" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/area/hallway/primary/fore) +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/engine/break_room) "bly" = ( /obj/structure/chair{ dir = 1 @@ -27426,10 +27479,10 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blE" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blF" = ( @@ -27486,9 +27539,6 @@ /turf/simulated/floor/plating, /area/quartermaster/miningdock) "blJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Dock"; @@ -27500,12 +27550,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"blK" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) +"blK" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -27523,6 +27573,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blL" = ( @@ -27977,7 +28030,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bmG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -27989,6 +28041,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -28202,9 +28255,6 @@ /turf/simulated/wall, /area/crew_quarters/kitchen) "bnb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window{ @@ -28213,6 +28263,9 @@ req_access_txt = "28" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bnc" = ( @@ -28604,7 +28657,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bob" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28613,6 +28665,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -28793,19 +28846,18 @@ }, /area/hallway/primary/central) "bos" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/engineering) "bot" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28814,6 +28866,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -28901,10 +28954,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "boB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -28917,15 +28966,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "boC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28938,6 +28988,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -28948,19 +29001,18 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "boE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "boF" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28968,6 +29020,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "boG" = ( @@ -28987,9 +29040,6 @@ /turf/simulated/floor/plating, /area/security/prisonershuttle) "boK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29003,6 +29053,9 @@ name = "Mining Maintenance"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "boL" = ( @@ -29643,7 +29696,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bpL" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29658,6 +29710,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -29723,10 +29776,6 @@ }, /area/hallway/primary/port) "bpV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -29736,30 +29785,31 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/hallway/primary/port) "bpW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/hallway/primary/port) "bpY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29767,12 +29817,12 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/fore) -"bpZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/fore) +"bpZ" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29780,27 +29830,27 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fore) -"bqa" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"bqa" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, /area/maintenance/fore) "bqb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29808,15 +29858,15 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" }, /area/maintenance/fore) "bqc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29825,37 +29875,36 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/fore) -"bqd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"bqd" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "bqe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "bqg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -29867,6 +29916,10 @@ icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "bqh" = ( @@ -29923,10 +29976,6 @@ }, /area/hallway/primary/central) "bqn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -29952,24 +30001,18 @@ }, /area/hallway/primary/central) "bqp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bqq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29985,26 +30028,21 @@ }, /area/hallway/primary/central) "bqr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "neutralcorner" }, -/area/hallway/primary/central) +/area/bridge/meeting_room) "bqs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30021,10 +30059,6 @@ }, /area/hallway/primary/central) "bqt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -30045,6 +30079,10 @@ codes_txt = "patrol;next_patrol=hall15"; location = "hall14" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30080,6 +30118,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30098,7 +30139,6 @@ /turf/simulated/floor/plating, /area/bridge) "bqz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30118,6 +30158,11 @@ codes_txt = "patrol;next_patrol=hall14"; location = "hall13" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Quartermaster Junction"; + sortType = 3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30128,6 +30173,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -30814,7 +30863,6 @@ }, /area/construction/hallway) "brU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30825,6 +30873,7 @@ codes_txt = "patrol;next_patrol=engi3"; location = "engi2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30851,6 +30900,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "bsa" = ( @@ -30902,11 +30952,11 @@ }, /area/bridge) "bsf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -30931,18 +30981,12 @@ }, /area/hallway/primary/central) "bsi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "bsj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -30953,9 +30997,6 @@ }, /area/hallway/primary/central) "bsl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "Observer-Start" }, @@ -30964,17 +31005,11 @@ }, /area/hallway/primary/central) "bsm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/hallway/primary/central) "bsn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /obj/machinery/camera{ c_tag = "Central Ring Hallway North"; @@ -30993,9 +31028,6 @@ }, /area/library) "bsq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ dir = 8; @@ -31003,9 +31035,6 @@ }, /area/hallway/primary/central) "bsr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -31017,31 +31046,11 @@ }, /area/hallway/primary/central) "bst" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Quartermaster Junction"; - sortType = 3 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"bsu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -31466,10 +31475,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btp" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31484,15 +31489,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "btq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31506,9 +31509,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31526,9 +31526,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bts" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31542,9 +31539,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31559,10 +31553,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -31603,7 +31593,6 @@ }, /area/hallway/primary/port) "btz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31616,6 +31605,7 @@ icon_state = "2-4"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -31664,24 +31654,22 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "btE" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; + d1 = 4; + d2 = 8; + icon_state = "4-8"; tag = "" }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "btF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31689,6 +31677,9 @@ tag = "" }, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "btG" = ( @@ -32139,6 +32130,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/atmos) "buA" = ( @@ -32170,10 +32162,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "buE" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32188,19 +32176,24 @@ /turf/simulated/floor/plasteel, /area/atmos) "buF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "buG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/arrow{ dir = 1 }, @@ -32213,9 +32206,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "buH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -32227,9 +32217,6 @@ /turf/simulated/floor/plating, /area/atmos) "buI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -32239,7 +32226,6 @@ }, /area/hallway/primary/port) "buJ" = ( -/obj/structure/disposalpipe/junction, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32249,6 +32235,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -32345,25 +32332,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"buV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"buW" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "buX" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -32764,13 +32732,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/atmos) "bvN" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/light{ dir = 8 }, @@ -32778,6 +32743,10 @@ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -32793,9 +32762,6 @@ }, /area/atmos) "bvP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32808,30 +32774,30 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bvQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bvR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -32850,12 +32816,12 @@ }, /obj/structure/window/reinforced, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/atmos) -"bvS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/atmos) +"bvS" = ( /obj/structure/cable{ d1 = 1; d2 = 8; @@ -32871,13 +32837,16 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/atmos) -"bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/atmos) +"bvT" = ( /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvU" = ( @@ -33536,6 +33505,7 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxa" = ( @@ -33588,13 +33558,13 @@ }, /area/hallway/primary/central) "bxf" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -33777,7 +33747,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bxz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -33790,6 +33759,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -34225,6 +34195,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "byz" = ( @@ -34327,7 +34298,6 @@ }, /area/hallway/primary/port) "byG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34337,6 +34307,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -34397,25 +34368,26 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "byK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "byL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34431,9 +34403,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "byM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34441,6 +34410,9 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -34469,10 +34441,6 @@ }, /area/hallway/primary/central) "byP" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34491,7 +34459,6 @@ }, /area/hallway/primary/central) "byQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -34632,9 +34599,9 @@ }, /area/hallway/primary/central) "bzb" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bzc" = ( @@ -35028,6 +34995,7 @@ /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "bzW" = ( @@ -35090,7 +35058,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "bAe" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -35100,6 +35067,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -35191,8 +35159,8 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bAo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "bAp" = ( @@ -35878,6 +35846,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -35948,7 +35917,6 @@ }, /area/atmos) "bBO" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -35961,6 +35929,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -36023,13 +35992,13 @@ }, /area/storage/tech) "bBV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Central Ring Hallway East"; dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -36065,24 +36034,24 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bBZ" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/requests_console{ department = "Primary Tool Storage"; name = "Primary Tool Storage Console"; pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel, /area/storage/primary) "bCa" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/storage/primary) "bCb" = ( @@ -36135,10 +36104,6 @@ /turf/simulated/wall, /area/storage/primary) "bCf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -36178,9 +36143,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bCh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -36221,48 +36183,6 @@ icon_state = "vault" }, /area/bridge) -"bCi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bCj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) "bCk" = ( /obj/structure/cable{ d1 = 4; @@ -36718,7 +36638,6 @@ }, /area/hallway/primary/central) "bCE" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -36729,6 +36648,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -37183,7 +37103,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bDt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37196,6 +37115,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -37214,22 +37137,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) -"bDw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -37256,6 +37164,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37274,7 +37183,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker) "bDC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -37283,6 +37191,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37316,10 +37225,6 @@ }, /area/storage/tech) "bDG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37503,49 +37408,7 @@ }, /turf/simulated/floor/plating, /area/bridge) -"bDV" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "HoP Junction"; - sortType = 13 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) -"bDW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) -"bDX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bDY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -37554,10 +37417,6 @@ }, /area/bridge) "bDZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -37773,9 +37632,9 @@ }, /area/hallway/primary/central) "bEq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -38063,6 +37922,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -38257,19 +38117,7 @@ icon_state = "neutralfull" }, /area/hallway/primary/central) -"bFt" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" - }, -/area/hallway/primary/central) "bFu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable, /obj/machinery/door/poddoor{ @@ -38281,26 +38129,6 @@ }, /turf/simulated/floor/plating, /area/bridge) -"bFv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bFw" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/bridge) "bFx" = ( /obj/machinery/light_switch{ pixel_x = -8; @@ -38323,20 +38151,6 @@ icon_state = "darkblue" }, /area/bridge) -"bFA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "darkblue" - }, -/area/bridge) "bFB" = ( /obj/machinery/camera{ c_tag = "Bridge Port"; @@ -38721,21 +38535,6 @@ icon_state = "dark" }, /area/turret_protected/ai) -"bGr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "bGs" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/electricshock{ @@ -38833,9 +38632,6 @@ }, /area/engine/break_room) "bGD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/cans/starkist, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -38845,9 +38641,6 @@ }, /area/engine/break_room) "bGE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/pen, @@ -38858,9 +38651,6 @@ }, /area/engine/break_room) "bGF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/lightreplacer, @@ -38871,9 +38661,6 @@ }, /area/engine/break_room) "bGG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -38892,15 +38679,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -38913,15 +38701,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -38932,15 +38720,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -38958,15 +38746,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -38980,15 +38768,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39000,15 +38788,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39024,15 +38812,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39061,15 +38849,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39082,6 +38870,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39114,10 +38905,6 @@ }, /area/storage/tech) "bGQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -39141,6 +38928,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39354,7 +39145,6 @@ /turf/simulated/wall, /area/bridge/meeting_room) "bHl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39374,11 +39164,11 @@ }, /area/bridge/meeting_room) "bHm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -39550,7 +39340,6 @@ }, /area/hallway/primary/central) "bHC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39559,6 +39348,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -39950,22 +39740,17 @@ }, /area/crew_quarters/chief) "bIr" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -6; pixel_y = 32 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/chief) "bIs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -39977,9 +39762,6 @@ }, /area/crew_quarters/chief) "bIt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ @@ -39991,9 +39773,6 @@ }, /area/crew_quarters/chief) "bIu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/rack, /obj/item/crowbar, /obj/item/storage/toolbox/mechanical, @@ -40005,9 +39784,6 @@ }, /area/crew_quarters/chief) "bIv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ pixel_y = 24 @@ -40017,9 +39793,6 @@ }, /area/crew_quarters/chief) "bIw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -40038,16 +39811,6 @@ icon_state = "yellow" }, /area/engine/break_room) -"bIz" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction"; - sortType = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" - }, -/area/engine/break_room) "bIA" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -40074,6 +39837,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -40107,15 +39871,15 @@ }, /area/engine/break_room) "bIG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -40312,7 +40076,6 @@ }, /area/hallway/primary/central) "bJe" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; @@ -40370,12 +40133,12 @@ }, /area/crew_quarters/captain) "bJk" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/machinery/light_switch{ pixel_x = 8; pixel_y = 26 }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -40842,11 +40605,18 @@ /area/crew_quarters/chief) "bKe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/chief) "bKf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -40858,6 +40628,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -40876,27 +40649,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/chief) -"bKi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"bKj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" - }, -/area/engine/break_room) "bKk" = ( /obj/structure/cable{ d1 = 4; @@ -40926,13 +40685,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/chief) "bKl" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40945,15 +40703,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, /area/engine/break_room) "bKp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40966,16 +40724,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bKq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -40994,6 +40751,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + name = "CE's Junction"; + sortType = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -41006,15 +40768,15 @@ }, /area/engine/break_room) "bKt" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -41095,6 +40857,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bKD" = ( @@ -41187,7 +40952,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bKL" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/phone, @@ -41280,22 +41044,18 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "bKZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/captain) "bLa" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41308,6 +41068,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -41371,10 +41135,6 @@ }, /area/storage/tools) "bLj" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -41384,6 +41144,10 @@ name = "north bump"; pixel_y = 24 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -41754,7 +41518,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bMa" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41766,6 +41529,7 @@ /obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -41944,7 +41708,6 @@ }, /area/engine/break_room) "bMt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41953,6 +41716,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" @@ -42092,9 +41856,6 @@ }, /area/storage/primary) "bML" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -42204,7 +41965,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bMS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -42300,7 +42060,6 @@ }, /area/crew_quarters/captain) "bNc" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42315,6 +42074,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -42675,10 +42435,6 @@ /turf/simulated/wall/r_wall, /area/turret_protected/aisat) "bNS" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "Atmospherics Junction"; - sortType = 6 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42688,6 +42444,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, +/obj/structure/disposalpipe/sortjunction{ + name = "Atmospherics Junction"; + sortType = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -42702,7 +42462,6 @@ }, /area/engine/break_room) "bNU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42716,6 +42475,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/break_room) "bNW" = ( @@ -43062,7 +42822,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOH" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ name = "Head of Personnel"; req_access = null; @@ -43088,7 +42847,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOJ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -43112,10 +42870,6 @@ }, /area/bridge/meeting_room) "bOL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43214,7 +42968,6 @@ }, /area/hallway/primary/central) "bOX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43224,6 +42977,7 @@ /obj/structure/chair/comfy/brown, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -43267,12 +43021,12 @@ }, /area/crew_quarters/captain) "bPc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -43815,6 +43569,7 @@ name = "Mining Maintenance"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bQb" = ( @@ -43878,16 +43633,16 @@ }, /area/engine/break_room) "bQg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bQh" = ( @@ -44001,10 +43756,6 @@ }, /area/security/brig) "bQp" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 @@ -44015,13 +43766,6 @@ network = list("Engineering","SS13"); pixel_y = -22 }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -44094,7 +43838,6 @@ }, /area/hallway/primary/starboard) "bQA" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44104,6 +43847,7 @@ /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "bQB" = ( @@ -44184,7 +43928,6 @@ /turf/simulated/wall, /area/blueshield) "bQJ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -44257,7 +44000,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bQQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44276,6 +44018,7 @@ /obj/item/stamp/captain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bQR" = ( @@ -44967,7 +44710,6 @@ }, /area/hallway/primary/central) "bSh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44977,6 +44719,7 @@ /obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -45183,9 +44926,9 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/heads/hop) "bSF" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -45270,7 +45013,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bSQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -45285,6 +45027,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bSR" = ( @@ -45303,37 +45046,37 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/captain/bedroom) "bSU" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bSW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -46152,13 +45895,6 @@ dir = 2; icon_state = "pipe-j2" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -46181,14 +45917,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Break Room"; req_access_txt = "10" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bUv" = ( @@ -46198,15 +45934,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -46244,13 +45980,13 @@ }, /area/engine/break_room) "bUz" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/structure/sign/poster/contraband/atmosia_independence{ pixel_x = 32 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -46418,10 +46154,6 @@ }, /area/crew_quarters/heads/hop) "bUR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/keycard_auth{ pixel_y = 26 @@ -46430,14 +46162,6 @@ icon_state = "wood" }, /area/crew_quarters/heads/hop) -"bUS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/crew_quarters/heads/hop) "bUT" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -46471,7 +46195,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bUX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46480,6 +46203,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bUY" = ( @@ -47482,7 +47206,6 @@ }, /area/crew_quarters/heads/hop) "bWW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -47497,6 +47220,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -47520,14 +47244,14 @@ }, /area/crew_quarters/captain/bedroom) "bXa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -47710,12 +47434,12 @@ }, /area/hallway/primary/starboard) "bXC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -47944,9 +47668,9 @@ /turf/simulated/wall, /area/engine/engineering) "bYc" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engineering) "bYe" = ( @@ -48063,7 +47787,6 @@ }, /area/crew_quarters/heads/hop) "bYs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -48100,7 +47823,6 @@ }, /area/crew_quarters/captain/bedroom) "bYz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48109,6 +47831,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -48542,11 +48265,11 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bZt" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZw" = ( @@ -48563,17 +48286,13 @@ /turf/space, /area/space/nearstation) "bZx" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZy" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "Engineering Junction"; - sortType = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -48582,6 +48301,10 @@ /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + name = "Engineering Junction"; + sortType = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZA" = ( @@ -48827,10 +48550,6 @@ icon_state = "dark" }, /area/crew_quarters/heads/hop) -"bZY" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads/hop) "caa" = ( /obj/structure/table/wood, /obj/machinery/light, @@ -48940,7 +48659,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "can" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48953,6 +48671,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cao" = ( @@ -49008,7 +48727,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cau" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -49016,6 +48734,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -49486,31 +49205,31 @@ }, /area/engine/engineering) "cbp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/engineering) "cbq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -49542,15 +49261,15 @@ }, /area/engine/engineering) "cbu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ c_tag = "Engine Room North"; network = list("Engineering","SS13") }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cbv" = ( @@ -49756,7 +49475,6 @@ /turf/simulated/floor/plating, /area/hallway/primary/central) "cbR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -49766,6 +49484,7 @@ /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "cbS" = ( @@ -49925,10 +49644,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cci" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -49940,12 +49655,13 @@ /obj/effect/landmark/start{ name = "Captain" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "ccj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -49955,15 +49671,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/captain/bedroom) "cck" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -49979,6 +49694,10 @@ /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -50785,7 +50504,6 @@ }, /area/crew_quarters/captain/bedroom) "cdW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -50794,6 +50512,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -51641,7 +51360,6 @@ }, /area/blueshield) "cfQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -51656,6 +51374,7 @@ req_access_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/crew_quarters/captain/bedroom) "cfR" = ( @@ -51674,13 +51393,13 @@ }, /area/hallway/primary/central) "cfS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -52168,7 +51887,6 @@ }, /area/crew_quarters/heads/hop) "chh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /turf/simulated/floor/carpet, @@ -52300,9 +52018,6 @@ /turf/space, /area/space/nearstation) "chx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52316,13 +52031,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/teleporter) "chy" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -52336,6 +52050,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/teleporter) "chz" = ( @@ -52558,7 +52276,6 @@ }, /area/tcommsat/chamber) "cia" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -52572,6 +52289,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "cib" = ( @@ -52766,12 +52484,12 @@ }, /area/library) "ciA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -52791,7 +52509,6 @@ }, /area/crew_quarters/heads/hop) "ciD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 1 }, @@ -52833,10 +52550,6 @@ }, /area/ntrep) "ciH" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52851,15 +52564,15 @@ c_tag = "NT Representative's Office"; dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/ntrep) "ciI" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -52883,6 +52596,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -52950,10 +52667,6 @@ /turf/simulated/floor/plating, /area/blueshield) "ciO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -52977,15 +52690,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/blueshield) "ciP" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -53000,6 +52713,10 @@ c_tag = "Blueshield's Office"; dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -53037,7 +52754,6 @@ /turf/simulated/wall, /area/crew_quarters/captain/bedroom) "ciU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53050,6 +52766,7 @@ req_access_txt = "17" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter) "ciV" = ( @@ -53525,7 +53242,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cjY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53534,6 +53250,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter) "cka" = ( @@ -53674,7 +53391,6 @@ }, /area/crew_quarters/heads/hop) "ckq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -53708,7 +53424,6 @@ /turf/simulated/floor/plating, /area/ntrep) "cku" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53720,6 +53435,7 @@ name = "NT Representative's Office"; req_access_txt = "73" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -53731,7 +53447,6 @@ }, /area/bridge/meeting_room) "ckw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53743,6 +53458,7 @@ name = "Blueshield's Office"; req_access_txt = "67" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -53771,10 +53487,6 @@ /turf/simulated/floor/plasteel, /area/teleporter) "ckB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -53786,23 +53498,23 @@ }, /obj/structure/table, /obj/item/hand_tele, -/turf/simulated/floor/plasteel, -/area/teleporter) -"ckC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/turf/simulated/floor/plasteel, -/area/teleporter) -"ckD" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/turf/simulated/floor/plasteel, +/area/teleporter) +"ckC" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel, +/area/teleporter) +"ckD" = ( /obj/machinery/bluespace_beacon, /obj/machinery/door_control{ id = "teleaccessshutter"; @@ -53811,6 +53523,10 @@ req_access_txt = "17" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/teleporter) "ckE" = ( @@ -53821,21 +53537,21 @@ /turf/simulated/floor/plating, /area/security/range) "ckF" = ( +/obj/machinery/teleport/hub, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/teleport/hub, /turf/simulated/floor/plating, /area/teleporter) "ckG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/poddoor/shutters{ dir = 2; id_tag = "teleaccessshutter"; name = "Teleporter Access Shutters" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/teleporter) "ckH" = ( @@ -53848,27 +53564,27 @@ }, /area/hallway/primary/central) "ckI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "ckJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -54485,7 +54201,6 @@ }, /area/crew_quarters/heads/hop) "clM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -54529,13 +54244,13 @@ }, /area/crew_quarters/heads/hop) "clQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -54594,13 +54309,13 @@ }, /area/bridge/meeting_room) "clV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -54632,10 +54347,6 @@ /turf/simulated/floor/plasteel, /area/teleporter) "clZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -54648,13 +54359,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/teleporter) "cma" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -54667,13 +54378,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/teleporter) -"cmb" = ( /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, +/turf/simulated/floor/plasteel, +/area/teleporter) +"cmb" = ( /obj/structure/cable{ d1 = 1; d2 = 8; @@ -54691,13 +54402,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/teleporter) "cmc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -54705,6 +54416,10 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/teleporter) "cmd" = ( @@ -54715,13 +54430,13 @@ /turf/simulated/floor/plating, /area/teleporter) "cme" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Central Ring Hallway East"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -55186,16 +54901,16 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "cnq" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55205,6 +54920,9 @@ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55218,6 +54936,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55233,16 +54955,15 @@ }, /area/crew_quarters/heads/hop) "cnv" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "cnw" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -55293,11 +55014,11 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cnC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -55721,6 +55442,7 @@ req_access_txt = "57" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -56098,7 +55820,6 @@ }, /area/engine/engineering) "cpt" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ d1 = 4; @@ -56112,6 +55833,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -56314,6 +56036,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -56342,6 +56067,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -56356,6 +56084,10 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -56446,25 +56178,22 @@ }, /area/bridge/meeting_room) "cpY" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -56473,46 +56202,46 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/bridge/meeting_room) "cqc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/bridge/meeting_room) "cqd" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56522,15 +56251,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -56543,15 +56272,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56564,29 +56293,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56594,15 +56323,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cqk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56610,15 +56339,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) "cql" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56626,38 +56355,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/bridge/meeting_room) -"cqm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "cqn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "cqo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -56670,22 +56391,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "cqp" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -56999,9 +56723,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cre" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57009,6 +56730,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -57444,9 +57168,6 @@ }, /area/bridge/meeting_room) "crQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57455,6 +57176,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -57494,11 +57218,11 @@ }, /area/hallway/primary/central) "crT" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -57848,10 +57572,6 @@ /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) "csL" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -57867,6 +57587,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/teleporter) "csM" = ( @@ -58012,12 +57736,12 @@ /turf/simulated/floor/plasteel, /area/bridge/meeting_room) "ctb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -59249,6 +58973,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -59745,10 +59470,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cwE" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/light{ dir = 8 }, @@ -59756,15 +59477,19 @@ c_tag = "Library Backroom"; dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/library) "cwF" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/chair/office/dark{ dir = 4 }, -/obj/structure/chair/office/dark{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -59772,46 +59497,46 @@ }, /area/library) "cwG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/paicard, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cwH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cwI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair/office/dark{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cwJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -60385,6 +60110,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -60495,10 +60223,10 @@ }, /area/library) "cya" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -60738,12 +60466,12 @@ }, /area/hallway/primary/central) "cyA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -61894,10 +61622,10 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cAG" = ( -/obj/structure/disposalpipe/segment, /obj/effect/landmark{ name = "lightsout" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -62062,11 +61790,11 @@ }, /area/library) "cAX" = ( +/obj/structure/filingcabinet, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62137,11 +61865,11 @@ }, /area/bridge/meeting_room) "cBh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -62705,10 +62433,6 @@ /turf/simulated/floor/plasteel, /area/medical/research) "cCo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -62717,22 +62441,26 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engineering) "cCp" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -63262,7 +62990,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cDH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -63272,6 +62999,7 @@ /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "cDI" = ( @@ -63334,10 +63062,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cDR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -63349,33 +63073,7 @@ icon_state = "neutral" }, /area/maintenance/port) -"cDS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cDT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cDU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/port) "cDV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -63385,30 +63083,15 @@ }, /area/maintenance/port) "cDW" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - name = "Library Junction"; - sortType = 17 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/port) "cDX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/maintenance/port) -"cDY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/port) "cDZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -63639,22 +63322,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cEE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cEH" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/port) "cEK" = ( /obj/structure/cable{ d1 = 4; @@ -63821,9 +63488,9 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cFc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -64151,13 +63818,13 @@ /turf/simulated/floor/plating/airless, /area/engine/engineering) "cFM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; req_access_txt = "12" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( @@ -64350,9 +64017,6 @@ }, /area/maintenance/port) "cGe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64365,12 +64029,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cGf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"cGf" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64384,15 +64048,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/maintenance/port) "cGg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64409,15 +64073,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/maintenance/port) "cGh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64437,12 +64101,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cGi" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"cGi" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64456,12 +64120,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cGj" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"cGj" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64474,15 +64138,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, /area/maintenance/port) "cGk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64501,12 +64165,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cGl" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"cGl" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64519,15 +64183,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/maintenance/port) "cGm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64541,13 +64205,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64564,6 +64227,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGo" = ( @@ -64580,6 +64246,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGp" = ( @@ -64595,6 +64264,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGq" = ( @@ -64613,6 +64285,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGr" = ( @@ -64626,6 +64301,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Library Junction"; + sortType = 16 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cGs" = ( @@ -64640,6 +64321,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -64660,13 +64344,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGu" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64686,12 +64369,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/port) -"cGv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"cGv" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64705,6 +64388,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( @@ -64717,10 +64403,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cGx" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64732,6 +64414,12 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "HoP Junction"; + sortType = 15 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -64756,6 +64444,9 @@ codes_txt = "patrol;next_patrol=hall6"; location = "hall5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -64844,11 +64535,6 @@ }, /area/hallway/primary/central) "cGE" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Medbay Junction"; - sortType = 13 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64863,14 +64549,16 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Medbay Junction"; + sortType = 13 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "cGF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64884,6 +64572,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/wood, /area/maintenance/starboard) "cGI" = ( @@ -65160,10 +64851,6 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cHl" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -65178,6 +64865,10 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -65276,10 +64967,6 @@ /turf/simulated/wall, /area/maintenance/port) "cHB" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -65292,73 +64979,71 @@ }, /area/hallway/primary/central) "cHC" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHE" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" }, /area/hallway/primary/central) "cHF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" }, /area/hallway/primary/central) "cHG" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Research Junction"; - sortType = 20 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Research Junction"; + sortType = 20 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" }, /area/hallway/primary/central) "cHH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -65370,22 +65055,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" }, /area/hallway/primary/central) "cHI" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -65401,24 +65089,21 @@ }, /area/hallway/primary/central) "cHK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/central) "cHL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -65426,65 +65111,68 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/central) "cHN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/central) "cHO" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "CMO's Junction"; - sortType = 20 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "CMO's Junction"; + sortType = 20 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/central) "cHP" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -65746,9 +65434,6 @@ /turf/simulated/wall, /area/maintenance/electrical) "cIz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -65764,6 +65449,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cIA" = ( @@ -75478,19 +75166,16 @@ }, /area/toxins/lab) "ddk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "ddl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -75499,6 +75184,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -96684,7 +96372,6 @@ }, /area/maintenance/port) "dWh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -96699,6 +96386,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/port) "dWi" = ( @@ -98295,13 +97983,13 @@ /turf/space, /area/maintenance/starboardsolar) "exL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -99103,9 +98791,6 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "hos" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -99118,6 +98803,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "hzb" = ( @@ -99630,11 +99318,11 @@ /turf/simulated/wall/r_wall, /area/security/seceqstorage) "jUC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -99807,13 +99495,13 @@ /turf/simulated/floor/plating, /area/security/warden) "kCi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -99965,9 +99653,6 @@ }, /area/security/brig) "lso" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -99976,6 +99661,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -100936,12 +100624,12 @@ }, /area/security/permasolitary) "pfp" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atm{ pixel_x = 32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -101198,6 +100886,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -101380,12 +101071,12 @@ }, /area/medical/surgery2) "rjr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -102016,6 +101707,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -102083,13 +101778,13 @@ /turf/simulated/floor/plating, /area/security/range) "ukK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -102770,9 +102465,6 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "xqH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -102997,15 +102689,15 @@ /turf/simulated/floor/plasteel, /area/security/permasolitary) "ygv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -127817,7 +127509,7 @@ bBA bDs bIx byl -bKi +bIx bKC bIx bGz @@ -128074,8 +127766,8 @@ bBB bLW bIy bGA -bKj -bLW +bIy +blx bNT bGz bQk @@ -128329,9 +128021,9 @@ byt bzS bEV bDt -bEV +bQt bQp -bIz +bQt bKl bMo bGz @@ -128587,7 +128279,7 @@ bIA bIA bDu bEW -bGC +bIA bIA bKp bMp @@ -128823,14 +128515,14 @@ aUc aVI aXp aYG -ban +bdr bbS bdr beM bgf bhn biS -bkG +bkF bmD bnY bpI @@ -128842,7 +128534,7 @@ bwX byv bKr bBE -bDw +bKp bEX bGD bIA @@ -129086,8 +128778,8 @@ bds beN aOb bhk -biT -bkH +aZm +bkF bmE bnZ bpJ @@ -129099,7 +128791,7 @@ byl byl byl bBF -bDw +bKp bEX bGE bEX @@ -129343,7 +129035,7 @@ aOb aXo aXo bho -biT +aZm bkI bmF boa @@ -129356,7 +129048,7 @@ bwY bOg bzW bBG -bDw +bKp bIA bGF bEX @@ -131149,7 +130841,7 @@ aOg btv btv btv -buF +buD bvQ ban byC @@ -133501,7 +133193,7 @@ czx cAS cAS cDR -cEE +cly cGn dmq cIM @@ -133757,7 +133449,7 @@ bYj bYj bYj bYj -cDS +drn dhG cGo dmq @@ -134014,9 +133706,9 @@ cxV czy bZK bYj -cDT +dhG dlM -bGr +cGe dmq cIM cIM @@ -134271,9 +133963,9 @@ cxW crn cAT bYj -cDU +czF drn -deO +cGi dmq cSq cKn @@ -134528,9 +134220,9 @@ cxX czA ctH bYj -cDS drn -deO +drn +cGi dmq cIM cIM @@ -134785,9 +134477,9 @@ cxY czA cAU bYj -cDS +drn drs -deO +cGi dmq cIL cIL @@ -135003,10 +134695,10 @@ aEu aMZ bqg brZ -aty -aty -apU -aIQ +aEu +aEu +aOv +bkG byJ bAl apU @@ -135042,9 +134734,9 @@ cxZ crn cAV bYj -cDS +drn dlM -deO +cGi dmq cIO cIO @@ -135264,7 +134956,7 @@ baF baF baF baF -aDt +bqe bOC bOC bOC @@ -135299,7 +134991,7 @@ bAa ctO cAW bYj -cDT +dhG dmy cGp dmq @@ -135521,7 +135213,7 @@ bmQ buP bvZ baF -aDt +bqe bOC bBX bDP @@ -135778,7 +135470,7 @@ bkT buQ bwa baF -aDw +aXJ bOC bBY bDK @@ -135813,9 +135505,9 @@ cyb ctO cAY bYj -cDS +drn dlM -bGr +cGe dmq cIO bQx @@ -136035,7 +135727,7 @@ bkU beU bwa baF -aEz +bpZ bOC bBZ bDL @@ -136070,9 +135762,9 @@ bYj bYj cFM bYj -cDT +dhG drn -deO +cGi dmq cIO cIO @@ -136328,7 +136020,7 @@ drn cDZ cCB cDW -drn +cDW cGr dmq dmq @@ -136806,7 +136498,7 @@ bmR beU bwa baF -byM +aEy bOC bCc bDN @@ -136841,7 +136533,7 @@ bYj czF cBb cHr -cDY +dlM drn cGt cHx @@ -137063,7 +136755,7 @@ bmU buR bwa baF -bpZ +aEz bOC bCd bDO @@ -137098,8 +136790,8 @@ bYj drn cHr drn -cDZ -cEH +drn +dhG cGu cHy cly @@ -137320,7 +137012,7 @@ btD buS bwb baF -bqe +aDt bOC bCg bDS @@ -137577,7 +137269,7 @@ bgp buT baF baF -btF +bkH bOC bCe bDQ @@ -137860,17 +137552,17 @@ bOW bOW cGC tVa -bOW -bOW -bOW +bsf +bsf +bsf cvs -bOW -bOW -bOW -bOW -bOW -bOW -chc +bsf +bsf +bsf +bsf +bsf +bsf +bst cGx cHB bvV @@ -138086,13 +137778,13 @@ blc bmX bom bqn -buV -btE -buV -buV -buV +bva +bSi +bva +bva +bva byP -buV +bva bCf bva bFs @@ -138342,17 +138034,17 @@ bjo bld bmW boo -bqp -bsf -cqm -buW -buW -buW +bqu +bIX +bSz +bIX +bIX +bIX byQ -bfy +bWM bDG -bfy -bFt +bWM +bWM bHi bIX bIX @@ -138373,7 +138065,7 @@ ckm bIX bIX bSz -cpO +bqp crr cEL ctQ @@ -138385,7 +138077,7 @@ cEL cEL cEL cEL -bqu +btE cHC ddn cZt @@ -138599,8 +138291,8 @@ bjp bQc aYZ boo -bqp -bsg +bqu +bhX bsv bvV bxi @@ -138856,17 +138548,17 @@ bjq blf aYZ boo -bqp -bqv +bqu +bIX bsv btH btH btH bwf bAr -bCi +bCl byU -bFv +bFR bHj bIY bKF @@ -138887,7 +138579,7 @@ ckn clI cno bSE -cpT +bqr cry csK ctR @@ -139113,17 +138805,17 @@ bjt blg aYZ boo -bqp -bqv +bqu +bIX btH aaa abj aaa bwf bAs -bCj -bDV -bFw +bCB +bAs +bAs bHj bIZ bKN @@ -139144,7 +138836,7 @@ cko clJ cnp bSE -cpT +bqr cry csK cBi @@ -139370,8 +139062,8 @@ bjs blh aYZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -139379,7 +139071,7 @@ aaa bwf aot bCk -bDW +bEk asz bHj bJa @@ -139627,8 +139319,8 @@ bjt blj aYZ bop -bqp -bqv +bqu +bIX btH aaa abj @@ -139636,7 +139328,7 @@ aaa bwf bAt bCl -bDX +byU bFx bHk bJb @@ -139658,7 +139350,7 @@ ckp clL bUT bSE -cpT +bqr cry csK cEs @@ -139884,7 +139576,7 @@ aYC blk aYZ boo -bqp +bqu bsi bsv abj @@ -139893,7 +139585,7 @@ abj bwf bAu bCl -bDX +byU bFy bHk bJc @@ -139903,9 +139595,9 @@ bOI bQH ciB bUR -bZY +chi bYs -bZY +chi bYs cnv bYs @@ -140141,8 +139833,8 @@ aYE bll bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -140159,7 +139851,7 @@ bMQ bOF bKN ciB -bUS +bWR bWT cbT chi @@ -140172,7 +139864,7 @@ ckr clN cnr bSE -cpT +bqr crw csK cEs @@ -140399,7 +140091,7 @@ blm bmZ boq bqq -bqv +bIX btH aaa abj @@ -140408,7 +140100,7 @@ bwf aos bCn bDZ -bFA +bFP bHl bJe bKL @@ -140655,8 +140347,8 @@ aYE blo bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -140912,7 +140604,7 @@ aZk bln aZa bor -bqr +dxV bsj bsv abj @@ -141169,8 +140861,8 @@ bjw bnc bmZ boo -bqp -bqv +bqu +bIX btH aaa bwc @@ -141426,8 +141118,8 @@ bdQ bne bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -141683,8 +141375,8 @@ bdP bQy bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -141940,8 +141632,8 @@ bjy bQy aYZ ibc -bqp -bqv +bqu +bIX btH aaa bwe @@ -142197,7 +141889,7 @@ bnb aYZ bna boo -bqp +bqu bsi bsv abj @@ -142700,12 +142392,12 @@ aTj aWm aZe aZe -aZe -aZe +aXX +aXX bgw -aIg -aZe -aZe +aXZ +aXX +aXX bhP bjB bar @@ -142968,7 +142660,7 @@ bhY bSB bMb bov -bqu +aXY bsm btH aaa @@ -143225,7 +142917,7 @@ bfq bdU bnd bov -bqu +aXY bsn bsv abj @@ -143482,8 +143174,8 @@ bjC bls bfq bov -bqu -ckH +aXY +bwm btH aaa bwj @@ -143739,8 +143431,8 @@ bfu blt bfq bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -143996,8 +143688,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -144253,8 +143945,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwl @@ -144510,7 +144202,7 @@ bfu blw bdU bgX -dxV +bfy bML bsv abj @@ -144763,12 +144455,12 @@ bcB bfu bea bgF -aZm -blx -bhX -aXX +bfu +blu +bhU +bov aXY -aXZ +bwm btH aaa abj @@ -145025,7 +144717,7 @@ blu bhU box bqx -ckH +bwm btH aaa abj @@ -145281,8 +144973,8 @@ bfu bly bfq bov -bqu -ckH +aXY +bwm btH aaa abj @@ -145538,7 +145230,7 @@ bfu blz bfq bov -bqu +aXY bsq bsv abj @@ -145795,8 +145487,8 @@ bjF blA bdU boy -bqu -ckH +aXY +bwm btH aaa abj @@ -146052,8 +145744,8 @@ bbi bbe bbe boz -bqu -ckH +aXY +bwm btH aaa abj @@ -146309,8 +146001,8 @@ bjG blB bbe boy -bqu -ckH +aXY +bwm btH aaa abj @@ -146566,8 +146258,8 @@ bjH blN bbi bov -bqu -ckH +aXY +bwm bsv btH btH @@ -146823,7 +146515,7 @@ bfA bnf bNB cpO -bqu +aXY bsr bsv btI @@ -147080,8 +146772,8 @@ bjI bnh bbi bov -bqu -ckH +aXY +bwm coE bwm bwm @@ -147338,7 +147030,7 @@ blF bbe boB bqz -bst +bva bSi bva bva @@ -147595,7 +147287,7 @@ bbe bbe boC bqA -bsu +bEq bSV bEq bEq @@ -148408,7 +148100,7 @@ cBF cAc cxn bDD -cGJ +buF boG boG cLa From 9e53a7b77c2d4de0316a90eee873060976245b2e Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Fri, 13 Aug 2021 08:27:01 -0400 Subject: [PATCH 4/4] Forgot the AXE --- _maps/map_files/Delta/delta.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5669dcfacb9..7a11fd22216 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -24112,6 +24112,9 @@ }, /obj/structure/closet/wardrobe/atmospherics_yellow, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/fireaxecabinet{ + pixel_x = 30 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution"