diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 84113dd676f..d073a1ac714 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -23943,20 +23943,14 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bfR" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; pixel_x = -24 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitered" @@ -24512,11 +24506,6 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/storage/belt/medical, /obj/item/clothing/glasses/hud/health, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitered" @@ -24527,25 +24516,38 @@ pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitered" }, /area/security/medbay) "bhd" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 24 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" }, /area/security/medbay) "bhf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/photocopier/faxmachine/longrange{ department = "Magistrate's Office" }, /obj/structure/table/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -25191,7 +25193,8 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4" + icon_state = "2-4"; + tag = "" }, /obj/structure/cable{ d1 = 1; @@ -25209,14 +25212,9 @@ dir = 4 }, /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26061,22 +26059,12 @@ /obj/item/clothing/gloves/color/latex, /obj/item/healthanalyzer, /obj/item/reagent_containers/spray/cleaner, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitered" }, /area/security/medbay) "bka" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -26084,6 +26072,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -26092,7 +26089,8 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26100,6 +26098,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -26108,12 +26109,14 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "4-8"; + tag = "" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4" + icon_state = "2-4"; + tag = "" }, /obj/structure/cable{ d1 = 1; @@ -26131,6 +26134,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" @@ -26153,6 +26159,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 = 8; icon_state = "red" @@ -27025,6 +27035,7 @@ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -27099,9 +27110,6 @@ }, /area/security/main) "bmd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, @@ -27470,9 +27478,9 @@ /turf/simulated/floor/plating, /area/atmos) "bmO" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -27721,28 +27729,22 @@ }, /area/security/brig) "bnq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/security/brig) +/area/security/medbay) "bnr" = ( /obj/structure/cable{ d1 = 4; @@ -27755,12 +27757,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, /area/security/brig) "bnt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -27770,6 +27772,7 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -28443,21 +28446,15 @@ }, /area/security/prisonershuttle) "boR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - 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 = 8; icon_state = "red" }, /area/security/brig) "boS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28481,9 +28478,6 @@ }, /area/bridge) "boU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28502,9 +28496,6 @@ }, /area/security/main) "boV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel{ @@ -28526,9 +28517,6 @@ }, /area/security/prisonershuttle) "boX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, /turf/simulated/floor/plasteel{ @@ -28537,9 +28525,6 @@ }, /area/security/main) "boY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 8; @@ -28547,37 +28532,35 @@ }, /area/security/main) "boZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/main) "bpa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/main) "bpb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28598,14 +28581,14 @@ req_access_txt = "58" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28616,28 +28599,28 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28657,14 +28640,14 @@ /obj/item/folder/red, /obj/item/stamp/hos, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28676,20 +28659,23 @@ /obj/effect/landmark/start{ name = "Head of Security" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpg" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -29466,9 +29452,6 @@ /turf/simulated/wall/rust, /area/maintenance/starboard) "bqJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -29509,23 +29492,19 @@ }, /area/security/prisonershuttle) "bqQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "bqR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29542,15 +29521,16 @@ /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 = "neutralfull" }, /area/security/brig) "bqS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29562,15 +29542,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/brig) "bqT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29597,16 +29577,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull"; tag = null }, /area/security/main) "bqU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29618,6 +29597,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 = 10; icon_state = "red" @@ -29713,6 +29696,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -29805,13 +29789,13 @@ }, /area/security/hos) "bri" = ( -/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 = "grimy" }, @@ -30344,10 +30328,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bsD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -30358,25 +30338,26 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bsE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/phone, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30385,15 +30366,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -30405,15 +30386,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/prisonershuttle) "bsH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30435,15 +30416,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/security/prisonershuttle) "bsI" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30455,6 +30435,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Brig Physisian Junction"; + sortType = 24 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -30470,6 +30455,7 @@ req_access_txt = "63"; req_one_access_txt = null }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30985,7 +30971,6 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -31000,6 +30985,7 @@ dir = 1 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btV" = ( @@ -31142,6 +31128,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31213,15 +31200,15 @@ }, /area/security/hos) "bun" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/machinery/light, /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -31670,12 +31657,12 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvn" = ( @@ -31693,6 +31680,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31709,6 +31699,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31722,6 +31715,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -31738,6 +31734,9 @@ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31778,6 +31777,9 @@ dir = 8 }, /obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/interrogation) "bvx" = ( @@ -31790,6 +31792,10 @@ id = 1; pixel_x = 25 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32421,7 +32427,6 @@ }, /area/security/nuke_storage) "bwy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -32432,6 +32437,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -32461,6 +32467,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -33056,7 +33063,6 @@ }, /area/security/prisonershuttle) "bxK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -33074,6 +33080,7 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -33122,6 +33129,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33782,7 +33792,10 @@ /turf/space, /area/space) "bzg" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -33832,7 +33845,6 @@ /turf/simulated/floor/plating, /area/security/brig) "bzm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34614,6 +34626,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -35772,7 +35785,8 @@ /area/bridge) "bCM" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -36711,10 +36725,10 @@ }, /area/hallway/primary/central) "bEr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -36729,16 +36743,17 @@ }, /area/security/brig) "bEw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Security Hallway South"; + dir = 8; + network = list("SS13","Security") }, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" }, -/turf/simulated/floor/plating, -/area/security/main) +/area/security/brig) "bEx" = ( /turf/simulated/wall/r_wall, /area/security/warden) @@ -38497,24 +38512,33 @@ /obj/structure/table/wood, /obj/item/taperecorder, /obj/item/restraints/handcuffs, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/detectives_office) "bHN" = ( /obj/structure/filingcabinet/security, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/detectives_office) "bHO" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38565,15 +38589,15 @@ }, /area/hallway/primary/starboard) "bHU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, -/area/security/main) +/area/security/brig) "bHV" = ( /obj/effect/decal/warning_stripes/east, /obj/structure/cable{ @@ -38651,7 +38675,6 @@ }, /area/security/brig) "bHZ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -38662,6 +38685,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Security Junction"; + sortType = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39291,12 +39319,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) "bJz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -39734,7 +39762,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/sortjunction{ name = "CE's Junction"; sortType = 5 @@ -40075,15 +40102,15 @@ }, /area/storage/tools) "bLk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/storage/tools) "bLl" = ( @@ -40138,7 +40165,6 @@ }, /area/security/detectives_office) "bLt" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "carpet" }, @@ -40178,18 +40204,17 @@ }, /area/security/brig) "bLy" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/hallway/primary/starboard) "bLz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -40220,9 +40245,7 @@ }, /area/security/brig) "bLD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -40271,7 +40294,6 @@ }, /area/security/processing) "bLK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -40459,12 +40481,12 @@ }, /area/hallway/primary/fore) "bMc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Primary Security Hallway North"; dir = 4; pixel_y = -22 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -41042,7 +41064,6 @@ }, /area/storage/tools) "bNk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -41054,6 +41075,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -41107,6 +41129,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -41120,7 +41143,6 @@ }, /area/security/detectives_office) "bNt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 8 }, @@ -41187,9 +41209,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bND" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -41200,14 +41219,10 @@ /area/security/processing) "bNE" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "redcorner" }, /area/security/brig) "bNF" = ( @@ -41226,11 +41241,6 @@ }, /area/security/processing) "bNH" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Brig Equipment Storage"; - sortType = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41244,9 +41254,6 @@ }, /area/security/brig) "bNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -41905,9 +41912,9 @@ }, /area/storage/tools) "bPf" = ( -/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/storage/tools) "bPg" = ( @@ -41988,6 +41995,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -42001,7 +42009,6 @@ }, /area/security/detectives_office) "bPp" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/plasteel{ @@ -42074,6 +42081,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPw" = ( @@ -42087,6 +42097,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPx" = ( @@ -42095,12 +42108,13 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/security/processing) -"bPy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/processing) +"bPy" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -42112,16 +42126,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "bPA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/light{ dir = 4 }, @@ -42572,6 +42586,9 @@ icon_state = "1-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42664,11 +42681,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bQz" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -42893,13 +42910,13 @@ /turf/simulated/floor/plating, /area/storage/tools) "bQX" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/glass{ name = "Auxiliary Tool Storage"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/storage/tools) "bRa" = ( @@ -42924,6 +42941,7 @@ req_access_txt = "4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -42950,20 +42968,17 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "bRd" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/hallway/primary/starboard) "bRe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -42971,12 +42986,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRf" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -42985,12 +43000,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRg" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRg" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -43011,24 +43026,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRh" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRh" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/brig) "bRi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43040,6 +43054,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" @@ -43052,6 +43069,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 = 4; icon_state = "redcorner" @@ -43881,11 +43902,11 @@ }, /area/hallway/primary/starboard) "bSY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -43923,9 +43944,6 @@ /turf/simulated/floor/plasteel, /area/storage/tools) "bTf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43933,6 +43951,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -43953,10 +43974,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard2) "bTh" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -45170,28 +45191,19 @@ }, /area/hallway/primary/starboard) "bVm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "redcorner" }, -/area/hallway/primary/starboard) +/area/security/brig) "bVn" = ( /obj/structure/cable{ d1 = 4; @@ -45343,11 +45355,11 @@ }, /area/hallway/primary/port) "bVD" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -46012,9 +46024,6 @@ }, /area/hallway/primary/starboard) "bXf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -46023,6 +46032,9 @@ pixel_y = -24 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -46046,37 +46058,36 @@ /turf/simulated/floor/plasteel, /area/lawoffice) "bXh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXi" = ( +/obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXj" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -46090,9 +46101,6 @@ }, /area/hallway/primary/starboard) "bXl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46100,6 +46108,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -46114,7 +46125,7 @@ /turf/simulated/floor/plating, /area/turret_protected/aisat) "bXn" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -46162,7 +46173,7 @@ }, /area/hallway/primary/port) "bXB" = ( -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -46185,12 +46196,12 @@ }, /area/hallway/primary/starboard) "bXD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Primary Security Hallway" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46388,8 +46399,15 @@ /turf/simulated/wall, /area/engine/engineering) "bYa" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 4; icon_state = "redcorner" }, /area/hallway/primary/starboard) @@ -46452,14 +46470,13 @@ /area/space/nearstation) "bYm" = ( /obj/structure/disposalpipe/segment{ - dir = 4; + dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" + icon_state = "cult" }, -/area/hallway/primary/starboard) +/area/magistrateoffice) "bYn" = ( /obj/structure/sign/directions/evac{ pixel_y = -8 @@ -46514,17 +46531,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) -"bYs" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "HoS Junction"; - sortType = 18 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/starboard) "bYu" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -46535,16 +46541,6 @@ "bYv" = ( /turf/simulated/wall/r_wall, /area/ntrep) -"bYw" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/hallway/primary/starboard) "bYx" = ( /turf/simulated/wall/r_wall, /area/blueshield) @@ -46682,6 +46678,7 @@ name = "Internal Affairs Office"; req_access_txt = "38" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/lawoffice) "bYP" = ( @@ -46698,6 +46695,7 @@ req_access_txt = "74" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/magistrateoffice) "bYQ" = ( @@ -47454,13 +47452,13 @@ }, /area/crew_quarters/courtroom) "caz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Primary Security Hallway East"; dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -47538,9 +47536,17 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/lawoffice) "caJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/lawoffice) "caK" = ( @@ -47552,14 +47558,13 @@ /turf/simulated/floor/wood, /area/lawoffice) "caM" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/computer/prisoner{ req_access = null; req_access_txt = "2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -48580,6 +48585,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -49244,10 +49250,6 @@ }, /area/lawoffice) "cep" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -49255,18 +49257,21 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/lawoffice) "ceq" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/wood, /area/lawoffice) "cer" = ( @@ -49957,7 +49962,6 @@ }, /area/lawoffice) "cgd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -49965,6 +49969,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 = "grimy" }, @@ -50014,10 +50019,6 @@ /turf/simulated/floor/carpet, /area/magistrateoffice) "cgj" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -50033,6 +50034,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -50626,7 +50631,6 @@ /turf/simulated/floor/wood, /area/lawoffice) "chO" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -50634,6 +50638,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/lawoffice) "chP" = ( @@ -56171,13 +56176,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/fitness) -"ctC" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/hallway/primary/starboard) "ctD" = ( /obj/structure/closet/masks, /turf/simulated/floor/plasteel, @@ -64025,16 +64023,6 @@ "cKr" = ( /turf/simulated/wall/r_wall, /area/medical/research) -"cKs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/brig) "cKt" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/northwest, @@ -65606,7 +65594,6 @@ dir = 1; initialize_directions = 11 }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" @@ -66146,17 +66133,6 @@ /obj/structure/sign/biohazard, /turf/simulated/wall, /area/toxins/xenobiology) -"cOZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/warden) "cPa" = ( /obj/item/radio/intercom{ dir = 4; @@ -68896,17 +68872,6 @@ icon_state = "neutral" }, /area/maintenance/starboard) -"cUN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/security/processing) "cUO" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons, @@ -69132,12 +69097,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) -"cVq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/security/processing) "cVr" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, @@ -69836,15 +69795,6 @@ icon_state = "white" }, /area/toxins/misc_lab) -"cWO" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/security/detectives_office) "cWP" = ( /obj/machinery/light{ dir = 4 @@ -70834,16 +70784,6 @@ "cZt" = ( /turf/simulated/wall, /area/medical/research) -"cZu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/hallway/primary/starboard) "cZv" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -72666,19 +72606,6 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dde" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "magistrate"; - name = "Magistrate Privacy Shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/magistrateoffice) "ddf" = ( /obj/structure/cable{ d1 = 1; @@ -76109,10 +76036,6 @@ dir = 4; initialize_directions = 11 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/structure/disposalpipe/sortjunction{ dir = 2; name = "RD Junction 1"; @@ -78599,7 +78522,6 @@ dir = 8; initialize_directions = 11 }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/sortjunction{ dir = 1; name = "CMO's Junction"; @@ -94694,6 +94616,10 @@ /area/medical/surgery2) "eSX" = ( /obj/item/twohanded/required/kirbyplants, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -95099,6 +95025,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -95153,9 +95082,6 @@ }, /area/security/processing) "gxd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -95518,6 +95444,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "HoS Junction"; + sortType = 7 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -95721,9 +95652,6 @@ }, /area/maintenance/starboard) "iDa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door_control{ id = "magistrate"; name = "Privacy Shutters Control"; @@ -95731,6 +95659,9 @@ }, /obj/structure/table/wood, /obj/machinery/computer/secure_data/laptop, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -95936,6 +95867,9 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96024,14 +95958,14 @@ }, /area/security/warden) "jCU" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, /obj/structure/filingcabinet, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -96120,7 +96054,6 @@ }, /area/hallway/primary/central) "jUH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -96278,13 +96211,13 @@ }, /area/security/detectives_office) "kyq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -96814,7 +96747,6 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "mtR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -96895,17 +96827,16 @@ /turf/simulated/floor/plasteel, /area/security/permasolitary) "mHP" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Security Junction"; - sortType = 13 - }, /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{ dir = 4; icon_state = "redcorner" @@ -97512,9 +97443,6 @@ }, /area/hallway/primary/central) "pgF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigWest"; @@ -97535,6 +97463,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "phv" = ( @@ -97681,6 +97612,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -97991,6 +97926,7 @@ dir = 8; network = list("SS13","Security") }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -98419,13 +98355,15 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/processing) "sEN" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -98527,10 +98465,8 @@ }, /area/maintenance/starboard) "tah" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -98677,6 +98613,9 @@ req_access_txt = "3" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/warden) "tHf" = ( @@ -98687,7 +98626,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/theatre) "tJH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -98785,12 +98723,14 @@ }, /area/security/brig) "tRM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -99030,6 +98970,12 @@ /area/security/securearmoury) "uKI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -99161,6 +99107,9 @@ network = list("Interrogation"); pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -99883,6 +99832,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -148406,9 +148358,9 @@ bJz bLt bNt bPp -cWO -cZu -bVm +bFU +rOn +bVk bXj bYM caG @@ -149939,8 +149891,8 @@ bxJ vnm bno eSX -bYa -bYm +bFX +bFX bEr bFX bMc @@ -149953,7 +149905,7 @@ bTj bVg bXn bYP -bXW +bYm ccD cer cgf @@ -150196,8 +150148,8 @@ bvm bwy bxK bzg -bzg -bYs +bJF +bJF bJF bJF bHT @@ -150209,7 +150161,7 @@ meB bTk bVp bXB -dde +bYR caM ccE ces @@ -150454,16 +150406,16 @@ bwz bxL bHS bAN -bYw -ctC -ctC -ctC -ctC +bAN +bAN +bAN +bAN +bAN bLz -ctC +bAN mtR mHP -bLz +bYa bVq bXp bYR @@ -150955,7 +150907,7 @@ bcU bex bhc uKI -uKI +bnq bka blT bno @@ -151729,7 +151681,7 @@ bhg biu bkd blV -bnp +boR boR bqQ bsI @@ -151990,18 +151942,18 @@ blW boS bqR bHZ -bNE -bnq +blW +dnd tJH -bNE +blW bzm -bHZ -bNE -bNE -bNE +mKe +blW +blW +blW jUH -bNE -bNE +blW +blW bNH sEN bRi @@ -152244,23 +152196,23 @@ biw bHW blX blX -bCM -bqS blX +bqS +bCM reH hHM bwA -bxQ +bLD bnr bAT -bxQ -bxQ -bxQ -bNm -bxQ -bxQ bLD -mEG +bLD +bLD +bEw +bLD +bNE +bLD +bVm bRj bxQ bxQ @@ -152501,7 +152453,7 @@ bhh bwE blY bhh -bEw +bhi bqT bsL buc @@ -152758,7 +152710,7 @@ bix bmO blZ bnt -bHU +blZ bqU bsL bkj @@ -153030,7 +152982,7 @@ bGj bLB bJM bLF -cUN +bLF bPv bRl obL @@ -153287,7 +153239,7 @@ bGk bLB bGp bLG -cVq +bLG bPw hTr gwZ @@ -153544,7 +153496,7 @@ bGl bLB bJN bLG -cVq +bLG bPx bRl bNG @@ -154313,8 +154265,8 @@ bBa bBa bBa bBa -bBa -bBa +bHU +bPy bPy bPz bRo @@ -154569,7 +154521,7 @@ blX blX blX blX -cKs +blX tRM bLK bPA @@ -154826,7 +154778,7 @@ bBc bJL bEx bEx -cOZ +bEA tFO bIe bEx