diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1b5b2645fad..5126ecf8d27 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -28,7 +28,7 @@ While normally provided, Heads of Staff and Maintainers are not obligated to pub All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception. -It is expected that contributors discuss larger design changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for. +It is expected that contributors discuss larger changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for. Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor. diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e0924f274e8..e5f0121446b 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" = ( @@ -11383,6 +11383,9 @@ "aFI" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/quartermaster/sorting) "aFJ" = ( @@ -11392,12 +11395,19 @@ }, /area/quartermaster/sorting) "aFK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/sorting) "aFL" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -11957,8 +11967,13 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aGO" = ( -/turf/simulated/wall, -/area/security/checkpoint/supply) +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "aGP" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor/west{ @@ -12517,35 +12532,29 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aIa" = ( -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -32 - }, -/obj/item/book/manual/security_space_law, -/obj/item/radio, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ dir = 9; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aIb" = ( /obj/machinery/light{ dir = 1; on = 1 }, -/obj/structure/table/reinforced, /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/machinery/recharger, +/obj/structure/chair/sofa, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aIc" = ( /obj/machinery/firealarm{ dir = 4; @@ -12558,11 +12567,13 @@ pixel_x = 25; pixel_y = 32 }, +/obj/structure/chair/sofa/left, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aId" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -12570,7 +12581,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "redcorner" + icon_state = "browncorner" }, /area/quartermaster/storage) "aIe" = ( @@ -13185,27 +13196,28 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aJi" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) -"aJj" = ( -/obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" + icon_state = "brown" }, -/area/security/checkpoint/supply) -"aJk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/area/quartermaster/sorting) +"aJj" = ( +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) +"aJk" = ( +/obj/machinery/computer/arcade/orion_trail, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/quartermaster/storage) "aJm" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -13217,7 +13229,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "brown" }, /area/quartermaster/storage) "aJo" = ( @@ -13884,83 +13896,50 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aKA" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/item/twohanded/required/kirbyplants, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) -"aKB" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/computer/security, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint/supply) -"aKC" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "whitepurplecorner" }, -/area/security/checkpoint/supply) +/area/medical/research) +"aKB" = ( +/obj/structure/chair, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/quartermaster/storage) +"aKC" = ( +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "aKD" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aKE" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining/glass{ + name = "Supply Break Room"; + req_access_txt = "31" }, /turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aKF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "brown" }, /area/quartermaster/storage) "aKG" = ( @@ -14610,30 +14589,35 @@ }, /area/quartermaster/office) "aMb" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "aMc" = ( -/obj/machinery/computer/supplycomp, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + dir = 8; + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aMd" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14645,13 +14629,15 @@ dir = 8; icon_state = "neutralfull" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aMe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aMf" = ( /obj/structure/closet/crate/internals, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -14743,14 +14729,17 @@ /turf/simulated/wall/r_wall, /area/security/execution) "aMw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - id_tag = null; - name = "Security Cargo Post"; - req_access_txt = "63" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/supply) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/medical/medbay) "aMx" = ( /obj/structure/cable{ d2 = 8; @@ -14968,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" @@ -15119,23 +15108,15 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/door_timer{ - id = "Cargo Cell"; - name = "Cargo Cell Timer"; - pixel_y = -32 +/obj/structure/chair{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" + dir = 8; + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aNr" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -15146,34 +15127,37 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "red" + dir = 8; + icon_state = "neutralfull" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aNs" = ( /obj/machinery/light{ dir = 4 }, -/obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; pixel_x = 24 }, /obj/machinery/camera{ - c_tag = "Medbay Storage"; + c_tag = "Cargo Break Room"; dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/area/security/checkpoint/supply) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/quartermaster/storage) "aNt" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "redcorner" + icon_state = "browncorner" }, /area/quartermaster/storage) "aNu" = ( @@ -15195,26 +15179,13 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - id_tag = "Cargo Cell"; - name = "Cargo Cell Door"; - req_access_txt = "63" +/obj/machinery/door/airlock/mining/glass{ + name = "Supply Break Room"; + req_access_txt = "31" }, /turf/simulated/floor/plasteel, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aNw" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow, @@ -15694,26 +15665,25 @@ }, /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" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aOx" = ( /turf/simulated/wall, /area/crew_quarters/theatre) @@ -15836,13 +15806,11 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aOO" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" }, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aOP" = ( /obj/structure/cable{ d1 = 1; @@ -15850,28 +15818,12 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/door/window/brigdoor{ - dir = 2; - id = "Cargo Cell"; - name = "Cargo Cell"; - req_access_txt = "63" - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + dir = 8; + icon_state = "neutralfull" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aOQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16537,34 +16489,27 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "aQj" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/door/airlock/medical{ + name = "Psych Office"; + req_access_txt = "64" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/medical/psych) "aQk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/closet/secure_closet/brig{ - id = "Cargo Cell" - }, +/obj/structure/table, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" + dir = 8; + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aQl" = ( /obj/structure/cable{ d1 = 1; @@ -16572,26 +16517,18 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" + dir = 8; + icon_state = "neutralfull" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aQm" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/machinery/vending/snack, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aQn" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -16602,21 +16539,10 @@ }, /area/quartermaster/storage) "aQo" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; - name = "Security Desk"; - req_access_txt = "63" - }, -/obj/machinery/door/window/northright{ - dir = 4; - name = "Security Desk" - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/supply) +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/turf/simulated/floor/wood, +/area/medical/psych) "aQp" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -17344,11 +17270,13 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aRQ" = ( +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ dir = 10; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aRR" = ( /obj/structure/cable{ d1 = 1; @@ -17356,45 +17284,36 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "red" + dir = 7; + icon_state = "yellow" }, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aRS" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "yellow" + }, +/area/quartermaster/storage) +"aRT" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/chair{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" + dir = 1; + icon_state = "white" }, -/area/security/checkpoint/supply) -"aRT" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/medical/medbay) "aRU" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -18086,18 +18005,7 @@ dir = 4 }, /turf/simulated/wall, -/area/security/checkpoint/supply) -"aTo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aTp" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ @@ -18109,12 +18017,8 @@ dir = 4 }, /obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, /turf/simulated/floor/plating, -/area/security/checkpoint/supply) +/area/quartermaster/storage) "aTr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -18150,17 +18054,8 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aTv" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "aTw" = ( /obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20558,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" }, @@ -20660,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{ @@ -20701,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" @@ -20730,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" @@ -20975,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" @@ -20990,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" @@ -21078,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" @@ -21112,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; @@ -21141,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; @@ -21156,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; @@ -21173,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; @@ -21187,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; @@ -21211,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" @@ -21236,7 +21151,6 @@ }, /area/crew_quarters/bar) "aZc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -21244,6 +21158,7 @@ dir = 4; pixel_x = 28 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -21330,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{ @@ -21361,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" }, @@ -21395,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" = ( @@ -21426,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" @@ -21970,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; @@ -21985,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" @@ -22108,9 +22031,6 @@ /turf/simulated/wall, /area/hydroponics) "baG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22125,7 +22045,6 @@ }, /area/hallway/primary/central) "baH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22136,6 +22055,7 @@ name = "Hydroponics Maintenance"; req_access_txt = "35" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "baI" = ( @@ -22301,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" }, @@ -22821,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" @@ -22922,7 +22835,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bce" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22930,6 +22842,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hydroponics) "bcf" = ( @@ -23167,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" @@ -23245,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"; @@ -23263,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" = ( @@ -23544,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" @@ -23820,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" }, @@ -23893,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" @@ -23940,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" @@ -23999,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" @@ -24060,7 +23972,6 @@ /turf/simulated/wall/r_wall, /area/security/medbay) "bey" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -24072,6 +23983,7 @@ name = "Mining Dock"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bez" = ( @@ -24187,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" @@ -24200,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" @@ -24274,11 +24189,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" }, @@ -24462,9 +24377,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" @@ -24514,15 +24429,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" = ( @@ -24557,13 +24483,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" @@ -24801,12 +24727,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" @@ -24895,12 +24821,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" = ( @@ -24943,7 +24869,6 @@ }, /area/crew_quarters/kitchen) "bgw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -24954,6 +24879,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" @@ -25006,9 +24932,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 @@ -25016,16 +24939,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 @@ -25033,6 +24955,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" @@ -25046,9 +24971,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 @@ -25056,6 +24978,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" @@ -25137,13 +25062,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" = ( @@ -25415,19 +25340,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" = ( @@ -25547,7 +25472,6 @@ }, /area/hallway/primary/fore) "bhP" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25560,6 +25484,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 +25515,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 +25528,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" @@ -25623,26 +25556,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; @@ -25662,42 +25595,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; @@ -25710,12 +25640,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; @@ -25726,6 +25656,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" @@ -25745,10 +25678,6 @@ }, /area/quartermaster/miningdock) "big" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -25762,6 +25691,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" @@ -25787,7 +25720,6 @@ }, /area/quartermaster/miningdock) "bii" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -25806,6 +25738,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26244,13 +26177,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 +26214,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" @@ -26365,7 +26305,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore) "bjd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -26373,6 +26312,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -26573,12 +26513,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; @@ -26587,6 +26521,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" @@ -26667,13 +26607,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" }, @@ -27127,36 +27067,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; @@ -27167,10 +27099,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 +27113,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 +27343,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 +27360,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 +27412,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 @@ -27531,10 +27482,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" = ( @@ -27591,9 +27542,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"; @@ -27605,12 +27553,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; @@ -27628,6 +27576,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blL" = ( @@ -28082,7 +28033,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bmG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28094,6 +28044,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" @@ -28307,9 +28258,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{ @@ -28318,6 +28266,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" = ( @@ -28709,7 +28660,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bob" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -28718,6 +28668,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" @@ -28898,19 +28849,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; @@ -28919,6 +28869,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" @@ -29006,10 +28957,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; @@ -29022,15 +28969,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; @@ -29043,6 +28991,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" @@ -29053,19 +29004,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; @@ -29073,6 +29023,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "boG" = ( @@ -29092,9 +29043,6 @@ /turf/simulated/floor/plating, /area/security/prisonershuttle) "boK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29108,6 +29056,9 @@ name = "Mining Maintenance"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "boL" = ( @@ -29748,7 +29699,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bpL" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29763,6 +29713,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" @@ -29828,10 +29779,6 @@ }, /area/hallway/primary/port) "bpV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -29841,30 +29788,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; @@ -29872,12 +29820,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; @@ -29885,27 +29833,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; @@ -29913,15 +29861,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; @@ -29930,37 +29878,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; @@ -29972,6 +29919,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 +29979,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 +30004,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; @@ -30090,26 +30031,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; @@ -30126,10 +30062,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 +30082,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 +30121,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 +30142,6 @@ /turf/simulated/floor/plating, /area/bridge) "bqz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30223,6 +30161,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 +30176,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" @@ -30919,7 +30866,6 @@ }, /area/construction/hallway) "brU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30930,6 +30876,7 @@ codes_txt = "patrol;next_patrol=engi3"; location = "engi2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30956,6 +30903,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fore) "bsa" = ( @@ -31007,11 +30955,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) @@ -31036,18 +30984,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 +31000,6 @@ }, /area/hallway/primary/central) "bsl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "Observer-Start" }, @@ -31069,17 +31008,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 +31031,6 @@ }, /area/library) "bsq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ dir = 8; @@ -31108,9 +31038,6 @@ }, /area/hallway/primary/central) "bsr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -31122,31 +31049,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) @@ -31571,10 +31478,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 +31492,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 +31512,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31631,9 +31529,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bts" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31647,9 +31542,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "btt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -31664,10 +31556,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; @@ -31708,7 +31596,6 @@ }, /area/hallway/primary/port) "btz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31721,6 +31608,7 @@ icon_state = "2-4"; tag = "" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -31769,24 +31657,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; @@ -31794,6 +31680,9 @@ tag = "" }, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "btG" = ( @@ -32244,6 +32133,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 +32165,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 +32179,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 }, @@ -32318,9 +32209,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 +32220,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 +32229,6 @@ }, /area/hallway/primary/port) "buJ" = ( -/obj/structure/disposalpipe/junction, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32354,6 +32238,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -32450,25 +32335,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 @@ -32869,13 +32735,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 }, @@ -32883,6 +32746,10 @@ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -32898,9 +32765,6 @@ }, /area/atmos) "bvP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32913,30 +32777,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; @@ -32955,12 +32819,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; @@ -32976,13 +32840,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" = ( @@ -33583,13 +33450,14 @@ /turf/simulated/floor/plating, /area/engine/break_room) "bwV" = ( -/obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave, /obj/structure/sign/poster/official/help_others{ pixel_x = -32 }, +/obj/structure/table/reinforced, +/mob/living/simple_animal/bot/floorbot, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 9; + icon_state = "yellow" }, /area/engine/break_room) "bwW" = ( @@ -33597,19 +33465,22 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 1; + icon_state = "yellow" }, /area/engine/break_room) "bwX" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, /obj/structure/extinguisher_cabinet{ pixel_x = 22 }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 5; + icon_state = "yellow" }, /area/engine/break_room) "bwY" = ( @@ -33637,6 +33508,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" = ( @@ -33689,13 +33561,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" @@ -33878,7 +33750,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bxz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -33891,6 +33762,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -34291,28 +34163,25 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "byt" = ( -/obj/structure/table/reinforced, /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/storage/box/donkpockets, +/obj/structure/rack, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/engine/break_room) -"byu" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 8; + icon_state = "yellow" }, /area/engine/break_room) "byv" = ( -/obj/machinery/vending/cola, /obj/machinery/newscaster{ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 4; + icon_state = "yellow" }, /area/engine/break_room) "byx" = ( @@ -34329,6 +34198,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" = ( @@ -34431,7 +34301,6 @@ }, /area/hallway/primary/port) "byG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34441,6 +34310,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -34501,25 +34371,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; @@ -34535,9 +34406,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "byM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34545,6 +34413,9 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -34573,10 +34444,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 +34462,6 @@ }, /area/hallway/primary/central) "byQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -34736,9 +34602,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" = ( @@ -35118,13 +34984,8 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/engine/break_room) -"bzT" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + dir = 8; + icon_state = "yellow" }, /area/engine/break_room) "bzV" = ( @@ -35137,6 +34998,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" = ( @@ -35199,7 +35061,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "bAe" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -35209,6 +35070,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -35300,8 +35162,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" = ( @@ -35786,12 +35648,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/engine/gravitygenerator) -"bBm" = ( -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/engine/break_room) "bBn" = ( /obj/structure/cable{ d1 = 1; @@ -35940,17 +35796,10 @@ icon_state = "yellow" }, /area/engine/break_room) -"bBC" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "yellow" - }, -/area/engine/break_room) "bBE" = ( /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" + dir = 4; + icon_state = "cautioncorner" }, /area/engine/break_room) "bBF" = ( @@ -36000,6 +35849,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" @@ -36070,7 +35920,6 @@ }, /area/atmos) "bBO" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -36083,6 +35932,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -36145,13 +35995,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" }, @@ -36187,24 +36037,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" = ( @@ -36257,10 +36107,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; @@ -36300,9 +36146,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bCh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -36343,48 +36186,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; @@ -36840,7 +36641,6 @@ }, /area/hallway/primary/central) "bCE" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -36851,6 +36651,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -37305,7 +37106,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bDt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37318,6 +37118,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 +37140,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 +37167,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37389,29 +37179,6 @@ icon_state = "caution" }, /area/engine/break_room) -"bDz" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 5 - }, -/obj/item/pen/multi, -/turf/simulated/floor/wood, -/area/medical/psych) -"bDA" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/item/storage/briefcase, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/wood, -/area/medical/psych) "bDB" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37419,7 +37186,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker) "bDC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -37428,20 +37194,23 @@ }, /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" }, /area/hallway/primary/port) "bDD" = ( -/obj/structure/chair/office/light{ +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Psychiatrist" - }, -/turf/simulated/floor/wood, -/area/medical/psych) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bDE" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/status_display{ @@ -37459,10 +37228,6 @@ }, /area/storage/tech) "bDG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37646,49 +37411,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 +37420,6 @@ }, /area/bridge) "bDZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -37916,9 +37635,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" @@ -38047,17 +37766,13 @@ }, /area/engine/gravitygenerator) "bEH" = ( -/obj/structure/sign/poster/random{ - pixel_x = 32 +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/wood, -/area/medical/psych) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bEI" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -38210,6 +37925,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 +38120,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 +38132,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 +38154,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"; @@ -38869,20 +38539,19 @@ }, /area/turret_protected/ai) "bGr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/basic, +/obj/structure/window/basic{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/window/basic{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/port) +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) "bGs" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/electricshock{ @@ -38980,9 +38649,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, @@ -38992,9 +38658,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 +38668,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 +38678,6 @@ }, /area/engine/break_room) "bGG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39039,15 +38696,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; @@ -39060,15 +38718,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; @@ -39079,15 +38737,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; @@ -39105,15 +38763,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; @@ -39127,15 +38785,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; @@ -39147,27 +38805,21 @@ /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; icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, /obj/effect/landmark{ name = "lightsout" }, @@ -39177,15 +38829,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; @@ -39214,15 +38866,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; @@ -39235,6 +38887,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" @@ -39267,10 +38922,6 @@ }, /area/storage/tech) "bGQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -39294,6 +38945,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" @@ -39507,7 +39162,6 @@ /turf/simulated/wall, /area/bridge/meeting_room) "bHl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39527,11 +39181,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" @@ -39703,7 +39357,6 @@ }, /area/hallway/primary/central) "bHC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -39712,6 +39365,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" @@ -40103,22 +39757,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, @@ -40130,9 +39779,6 @@ }, /area/crew_quarters/chief) "bIt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ @@ -40144,9 +39790,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 +39801,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 +39810,6 @@ }, /area/crew_quarters/chief) "bIw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -40191,15 +39828,6 @@ icon_state = "yellow" }, /area/engine/break_room) -"bIz" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" - }, -/area/engine/break_room) "bIA" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -40226,6 +39854,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" @@ -40259,30 +39888,20 @@ }, /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" }, /area/hallway/primary/central) -"bIH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bII" = ( /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -40410,26 +40029,6 @@ icon_state = "neutralfull" }, /area/storage/primary) -"bIW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint/engineering) "bIX" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -40494,7 +40093,6 @@ }, /area/hallway/primary/central) "bJe" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; @@ -40552,12 +40150,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" }, @@ -41024,11 +40622,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 +40645,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 +40666,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 +40702,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 +40720,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 +40741,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 +40768,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" @@ -41187,19 +40784,16 @@ icon_state = "yellow" }, /area/engine/break_room) -"bKs" = ( -/turf/simulated/wall, -/area/security/checkpoint/engineering) "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" @@ -41234,7 +40828,7 @@ "bKw" = ( /obj/structure/sign/electricshock, /turf/simulated/wall, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bKy" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/ai_status_display{ @@ -41280,6 +40874,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 +40969,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, @@ -41465,22 +41061,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; @@ -41493,6 +41085,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" }, @@ -41556,10 +41152,6 @@ }, /area/storage/tools) "bLj" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -41569,6 +41161,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" @@ -41939,7 +41535,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bMa" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41951,6 +41546,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" @@ -42129,7 +41725,6 @@ }, /area/engine/break_room) "bMt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42138,6 +41733,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" @@ -42165,40 +41761,38 @@ icon_state = "yellow" }, /area/engine/break_room) -"bMx" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) "bMy" = ( -/obj/structure/chair{ - dir = 4 - }, +/obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ dir = 9; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bMz" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/obj/machinery/vending/chinese, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bMA" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/sign/poster/official/random{ + pixel_y = 32 }, -/obj/structure/closet/secure_closet/brig{ - id = "engcell" +/obj/item/radio/intercom{ + pixel_x = 29; + pixel_y = -1 }, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) -"bMB" = ( -/turf/simulated/wall/r_wall, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bMC" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -42219,8 +41813,8 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/turf/simulated/floor/carpet, -/area/medical/psych) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bME" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -42279,9 +41873,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 +41982,6 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bMS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -42487,7 +42077,6 @@ }, /area/crew_quarters/captain) "bNc" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42502,6 +42091,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" }, @@ -42833,9 +42423,6 @@ /obj/machinery/ai_status_display, /turf/simulated/wall/r_wall, /area/turret_protected/aisat) -"bNO" = ( -/turf/simulated/floor/carpet, -/area/medical/psych) "bNP" = ( /obj/machinery/door/firedoor, /obj/machinery/flasher{ @@ -42860,22 +42447,11 @@ icon_state = "vault" }, /area/turret_protected/aisat) -"bNQ" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/medical/psych) "bNR" = ( /obj/machinery/status_display, /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; @@ -42885,6 +42461,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" @@ -42899,7 +42479,6 @@ }, /area/engine/break_room) "bNU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42913,6 +42492,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" = ( @@ -43043,10 +42623,15 @@ /turf/simulated/wall, /area/engine/break_room) "bOh" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "cautioncorner" + }, +/area/hallway/primary/port) "bOi" = ( /obj/structure/sign/securearea, /turf/simulated/wall, @@ -43060,36 +42645,33 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/storage/tech) -"bOk" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint/engineering) -"bOl" = ( -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint/engineering) "bOm" = ( +/obj/structure/chair/comfy/brown, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" + dir = 4; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bOn" = ( -/obj/machinery/firealarm{ +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/machinery/power/apc{ dir = 8; + name = "west bump"; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/area/hallway/primary/port) +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" + }, +/area/engine/break_room) "bOo" = ( /obj/structure/cable{ d1 = 1; @@ -43257,7 +42839,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; @@ -43283,7 +42864,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 +42887,6 @@ }, /area/bridge/meeting_room) "bOL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43409,7 +42985,6 @@ }, /area/hallway/primary/central) "bOX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -43419,6 +42994,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" }, @@ -43462,12 +43038,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" @@ -44010,6 +43586,7 @@ name = "Mining Maintenance"; req_access_txt = "48" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bQb" = ( @@ -44073,16 +43650,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" = ( @@ -44196,10 +43773,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 @@ -44231,51 +43804,21 @@ /area/engine/engineering) "bQs" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, /turf/simulated/floor/plating, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bQt" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) -"bQu" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - id = "engcell"; - name = "Engineering Cell"; - req_access_txt = "63" - }, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + dir = 8; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bQv" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" }, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bQw" = ( /obj/machinery/camera{ c_tag = "Port Hallway South"; @@ -44312,7 +43855,6 @@ }, /area/hallway/primary/starboard) "bQA" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44322,6 +43864,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" = ( @@ -44402,7 +43945,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{ @@ -44475,7 +44017,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bQQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44494,6 +44035,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" = ( @@ -45185,7 +44727,6 @@ }, /area/hallway/primary/central) "bSh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -45195,6 +44736,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" @@ -45214,14 +44756,6 @@ icon_state = "neutralfull" }, /area/hallway/primary/central) -"bSj" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/engine/engineering) "bSk" = ( /obj/structure/cable{ d1 = 1; @@ -45229,52 +44763,26 @@ icon_state = "1-2"; tag = "" }, -/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" + dir = 8; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bSl" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/item/storage/box/donkpockets, +/obj/structure/table, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bSm" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/door_timer{ - dir = 10; - id = "engcell"; - name = "Engineering Cell Timer"; - pixel_y = 32 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" + dir = 8; + icon_state = "neutralfull" }, -/area/security/checkpoint/engineering) -"bSn" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bSo" = ( /obj/machinery/camera{ c_tag = "MiniSat Central"; @@ -45435,9 +44943,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" }, @@ -45522,7 +45030,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bSQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -45537,6 +45044,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" = ( @@ -45555,37 +45063,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" @@ -46388,7 +45896,6 @@ /turf/simulated/floor/plasteel, /area/storage/tech) "bUs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46401,6 +45908,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -46417,72 +45928,44 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore) "bUu" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, +/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" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bUw" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -46490,60 +45973,42 @@ /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/security/checkpoint/engineering) +/area/engine/break_room) "bUx" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair/office/dark, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/checkpoint/engineering) -"bUy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bUz" = ( -/obj/structure/table/reinforced, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 +/obj/structure/sign/poster/contraband/atmosia_independence{ + pixel_x = 32 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/item/book/manual/security_space_law, -/obj/item/radio, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bUA" = ( /obj/machinery/light{ dir = 8 @@ -46706,10 +46171,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 +46179,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{ @@ -46759,7 +46212,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bUX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46768,6 +46220,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" = ( @@ -47105,10 +46558,6 @@ icon_state = "vault" }, /area/engine/break_room) -"bVz" = ( -/obj/machinery/status_display, -/turf/simulated/wall/r_wall, -/area/security/checkpoint/medical) "bVA" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -47190,10 +46639,6 @@ icon_state = "dark" }, /area/construction/hallway) -"bVI" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall/r_wall, -/area/security/checkpoint/medical) "bVJ" = ( /obj/structure/cable{ d1 = 1; @@ -47550,7 +46995,6 @@ /area/magistrateoffice) "bWt" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable, /turf/simulated/floor/plating, /area/engine/engineering) "bWu" = ( @@ -47562,46 +47006,49 @@ }, /turf/simulated/floor/plasteel{ dir = 10; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bWv" = ( /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/machinery/computer/station_alert, -/turf/simulated/floor/plasteel{ - icon_state = "red" +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/area/security/checkpoint/engineering) +/turf/simulated/floor/plasteel{ + dir = 0; + icon_state = "yellow" + }, +/area/engine/break_room) "bWw" = ( /obj/machinery/light, /obj/machinery/newscaster/security_unit{ pixel_y = -32 }, -/obj/machinery/computer/security, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/table/wood, /turf/simulated/floor/plasteel{ - icon_state = "red" + dir = 0; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bWx" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ - icon_state = "red" + dir = 0; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bWy" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, /obj/machinery/status_display{ pixel_x = 32 }, @@ -47609,11 +47056,16 @@ pixel_x = 28; pixel_y = -32 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "red" + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bWz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -47696,6 +47148,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bWO" = ( @@ -47768,7 +47223,6 @@ }, /area/crew_quarters/heads/hop) "bWW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -47783,6 +47237,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" }, @@ -47806,14 +47261,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" }, @@ -47988,8 +47443,7 @@ /area/hallway/primary/port) "bXB" = ( /obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -47997,12 +47451,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" @@ -48022,20 +47476,18 @@ /area/hallway/primary/starboard) "bXE" = ( /obj/machinery/camera{ - c_tag = "Engineering Security Checkpoint"; + c_tag = "Engineering Break Room"; dir = 8; network = list("SS13","Security") }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 +/obj/structure/chair/comfy/brown{ + dir = 1 }, -/obj/structure/closet/secure_closet/security/engine, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "yellow" }, -/area/security/checkpoint/engineering) +/area/engine/break_room) "bXF" = ( /obj/structure/cable{ d1 = 4; @@ -48233,16 +47685,11 @@ /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) -"bYd" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) "bYe" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -48357,7 +47804,6 @@ }, /area/crew_quarters/heads/hop) "bYs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -48394,7 +47840,6 @@ }, /area/crew_quarters/captain/bedroom) "bYz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48403,6 +47848,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" }, @@ -48836,11 +48282,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" = ( @@ -48857,16 +48303,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" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -48875,6 +48318,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" = ( @@ -49120,10 +48567,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, @@ -49233,7 +48676,6 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "can" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -49246,6 +48688,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" = ( @@ -49301,7 +48744,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 @@ -49309,6 +48751,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -49779,31 +49222,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" @@ -49835,15 +49278,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" = ( @@ -50049,7 +49492,6 @@ /turf/simulated/floor/plating, /area/hallway/primary/central) "cbR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -50059,6 +49501,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" = ( @@ -50218,10 +49661,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; @@ -50233,12 +49672,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; @@ -50248,15 +49688,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; @@ -50272,6 +49711,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" }, @@ -51078,7 +50521,6 @@ }, /area/crew_quarters/captain/bedroom) "cdW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -51087,6 +50529,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" }, @@ -51934,7 +51377,6 @@ }, /area/blueshield) "cfQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -51949,6 +51391,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" = ( @@ -51967,13 +51410,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" }, @@ -52461,7 +51904,6 @@ }, /area/crew_quarters/heads/hop) "chh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /turf/simulated/floor/carpet, @@ -52593,9 +52035,6 @@ /turf/space, /area/space/nearstation) "chx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52609,13 +52048,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; @@ -52629,6 +52067,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" = ( @@ -52851,7 +52293,6 @@ }, /area/tcommsat/chamber) "cia" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -52865,6 +52306,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" = ( @@ -53059,12 +52501,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" }, @@ -53084,7 +52526,6 @@ }, /area/crew_quarters/heads/hop) "ciD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 1 }, @@ -53126,10 +52567,6 @@ }, /area/ntrep) "ciH" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -53144,15 +52581,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; @@ -53176,6 +52613,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" }, @@ -53243,10 +52684,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; @@ -53270,15 +52707,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; @@ -53293,6 +52730,10 @@ c_tag = "Blueshield's Office"; dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -53330,7 +52771,6 @@ /turf/simulated/wall, /area/crew_quarters/captain/bedroom) "ciU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53343,6 +52783,7 @@ req_access_txt = "17" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter) "ciV" = ( @@ -53818,7 +53259,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cjY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53827,6 +53267,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" = ( @@ -53967,7 +53408,6 @@ }, /area/crew_quarters/heads/hop) "ckq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -54001,7 +53441,6 @@ /turf/simulated/floor/plating, /area/ntrep) "cku" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -54013,6 +53452,7 @@ name = "NT Representative's Office"; req_access_txt = "73" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -54024,7 +53464,6 @@ }, /area/bridge/meeting_room) "ckw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -54036,6 +53475,7 @@ name = "Blueshield's Office"; req_access_txt = "67" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -54064,10 +53504,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" @@ -54079,23 +53515,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"; @@ -54104,6 +53540,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" = ( @@ -54114,21 +53554,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" = ( @@ -54141,27 +53581,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" }, @@ -54559,15 +53999,12 @@ tag = "" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Break Room"; + req_access_txt = "10" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint/engineering) +/turf/simulated/floor/plasteel, +/area/engine/break_room) "clp" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating/airless, @@ -54781,7 +54218,6 @@ }, /area/crew_quarters/heads/hop) "clM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -54825,13 +54261,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" @@ -54890,13 +54326,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" @@ -54928,10 +54364,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; @@ -54944,13 +54376,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; @@ -54963,13 +54395,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; @@ -54987,13 +54419,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; @@ -55001,6 +54433,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" = ( @@ -55011,13 +54447,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" }, @@ -55105,11 +54541,9 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "cmt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/medical/psych) +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cmv" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -55484,16 +54918,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" }, @@ -55503,6 +54937,9 @@ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55516,6 +54953,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,16 +54972,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" }, @@ -55591,11 +55031,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" }, @@ -56019,6 +55459,7 @@ req_access_txt = "57" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -56396,7 +55837,6 @@ }, /area/engine/engineering) "cpt" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ d1 = 4; @@ -56410,6 +55850,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -56612,6 +56053,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 +56084,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 +56101,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" @@ -56744,25 +56195,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; @@ -56771,46 +56219,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 }, @@ -56820,15 +56268,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; @@ -56841,15 +56289,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 }, @@ -56862,29 +56310,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 }, @@ -56892,15 +56340,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 }, @@ -56908,15 +56356,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 }, @@ -56924,38 +56372,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; @@ -56968,22 +56408,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" }, @@ -57297,9 +56740,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cre" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57307,6 +56747,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" @@ -57742,9 +57185,6 @@ }, /area/bridge/meeting_room) "crQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57753,6 +57193,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" @@ -57792,11 +57235,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" }, @@ -58146,10 +57589,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; @@ -58165,6 +57604,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" = ( @@ -58310,12 +57753,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" @@ -59547,6 +58990,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -60043,10 +59487,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cwE" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/light{ dir = 8 }, @@ -60054,15 +59494,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{ @@ -60070,46 +59514,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" }, @@ -60683,6 +60127,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" @@ -60793,10 +60240,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" }, @@ -61036,12 +60483,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" }, @@ -62192,10 +61639,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" @@ -62360,11 +61807,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" }, @@ -62435,11 +61882,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" @@ -63003,10 +62450,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; @@ -63015,22 +62458,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" }, @@ -63560,7 +63007,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cDH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -63570,6 +63016,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" = ( @@ -63632,10 +63079,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 +63090,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 +63100,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; @@ -63813,19 +63215,6 @@ }, /turf/simulated/floor/plasteel, /area/gateway) -"cEm" = ( -/obj/machinery/door_control{ - id = "psychoffice"; - name = "Privacy Shutters Control"; - pixel_x = -25 - }, -/obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/alarm{ - pixel_y = 24 - }, -/turf/simulated/floor/wood, -/area/medical/psych) "cEn" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel, @@ -63950,22 +63339,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; @@ -64132,17 +63505,17 @@ /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" }, /area/hallway/primary/central) "cFd" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/medical/psych) +/obj/item/rack_parts, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cFe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -64462,13 +63835,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" = ( @@ -64661,9 +64034,6 @@ }, /area/maintenance/port) "cGe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -64676,12 +64046,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; @@ -64695,15 +64065,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; @@ -64720,15 +64090,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; @@ -64748,12 +64118,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; @@ -64767,12 +64137,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; @@ -64785,15 +64155,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; @@ -64812,12 +64182,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; @@ -64830,15 +64200,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; @@ -64852,13 +64222,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; @@ -64875,6 +64244,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 +64263,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 +64281,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 +64302,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 +64318,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 +64338,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 +64361,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,12 +64386,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; @@ -65016,6 +64405,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( @@ -65028,10 +64420,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 +64431,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 +64461,9 @@ codes_txt = "patrol;next_patrol=hall6"; location = "hall5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -65155,11 +64552,6 @@ }, /area/hallway/primary/central) "cGE" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Medbay Junction"; - sortType = 13 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -65174,14 +64566,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; @@ -65194,53 +64588,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/medical{ - name = "Psych Office"; - req_access_txt = "64" - }, -/turf/simulated/floor/wood, -/area/medical/psych) -"cGG" = ( +/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /turf/simulated/floor/wood, -/area/medical/psych) -"cGH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/wood, -/area/medical/psych) +/area/maintenance/starboard) "cGI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65257,12 +64610,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/door/airlock/maintenance{ - name = "Psych Office Maintenance"; - req_access = "64" - }, +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/medical/psych) +/area/maintenance/starboard) "cGJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65518,10 +64868,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; @@ -65536,6 +64882,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" @@ -65634,10 +64984,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,73 +64996,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 }, @@ -65728,22 +65072,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" @@ -65759,24 +65106,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 }, @@ -65784,91 +65128,72 @@ /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" }, /area/hallway/primary/central) -"cHR" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "psychoffice"; - name = "Privacy Shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/medical/psych) -"cHS" = ( -/turf/simulated/floor/wood, -/area/medical/psych) -"cHT" = ( -/obj/structure/closet/secure_closet/psychiatrist, -/obj/item/clipboard{ - pixel_x = -5 - }, -/turf/simulated/floor/wood, -/area/medical/psych) "cHV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -66126,9 +65451,6 @@ /turf/simulated/wall, /area/maintenance/electrical) "cIz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -66144,6 +65466,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/port) "cIA" = ( @@ -67029,25 +66354,19 @@ /turf/simulated/wall, /area/medical/medbay) "cKZ" = ( -/obj/structure/chair/comfy/lime{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/medical/psych) +/obj/structure/table, +/obj/item/storage/toolbox/electrical, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cLa" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/carpet, -/area/medical/psych) +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cLb" = ( -/obj/structure/bed/psych, -/turf/simulated/floor/carpet, -/area/medical/psych) -"cLc" = ( -/turf/simulated/wall, -/area/medical/psych) +/obj/structure/table_frame, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cLd" = ( /obj/structure/cable{ d2 = 4; @@ -67521,9 +66840,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/medical/research) -"cLZ" = ( -/turf/simulated/wall, -/area/security/checkpoint/science) "cMa" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -67532,19 +66848,13 @@ pixel_x = -28; pixel_y = 30 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24; - pixel_y = 4 - }, -/obj/structure/closet/secure_closet/security/science, +/obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ dir = 9; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cMb" = ( -/obj/structure/table/reinforced, /obj/item/radio/intercom{ dir = 1; pixel_y = 28 @@ -67553,27 +66863,21 @@ dir = 1; on = 1 }, -/obj/machinery/recharger, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cMc" = ( -/obj/structure/table/reinforced, /obj/machinery/status_display{ pixel_y = 32 }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 32 - }, -/obj/item/book/manual/security_space_law, -/obj/item/radio, +/obj/structure/chair/comfy/purp, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cMd" = ( /obj/structure/table, /obj/item/folder/white, @@ -67720,12 +67024,6 @@ icon_state = "whitebluecorner" }, /area/medical/medbay) -"cMx" = ( -/turf/simulated/wall, -/area/security/checkpoint/medical) -"cMy" = ( -/turf/simulated/wall/r_wall, -/area/security/checkpoint/medical) "cMz" = ( /turf/simulated/wall, /area/medical/medbay2) @@ -68197,35 +67495,19 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"cNz" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) "cNA" = ( -/obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = 24 - }, +/obj/machinery/vending/snack, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cNB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/science) -"cNC" = ( -/obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" + icon_state = "white" }, -/area/security/checkpoint/science) +/area/medical/research) "cND" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -68510,44 +67792,38 @@ /turf/space, /area/space/nearstation) "cOa" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/security_space_law, -/obj/item/radio, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" +/obj/structure/chair/comfy/lime{ + dir = 4 }, -/area/security/checkpoint/medical) +/obj/machinery/door_control{ + id = "psychoffice"; + name = "Privacy Shutters Control"; + pixel_x = -25 + }, +/turf/simulated/floor/carpet, +/area/medical/psych) "cOb" = ( -/obj/structure/table/reinforced, /obj/machinery/light{ dir = 1 }, -/obj/machinery/recharger, /obj/item/radio/intercom{ dir = 1; pixel_y = 25 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/turf/simulated/floor/carpet, +/area/medical/psych) "cOc" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/obj/structure/closet/secure_closet/security/med, /obj/structure/extinguisher_cabinet{ pixel_x = 28; pixel_y = 30 }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/obj/structure/bed/psych, +/turf/simulated/floor/carpet, +/area/medical/psych) "cOd" = ( /obj/structure/table, /obj/machinery/newscaster{ @@ -69091,75 +68367,44 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cPj" = ( -/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/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/checkpoint/science) -"cPk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/medical/research) +"cPk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/science) -"cPl" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/effect/landmark/start{ + name = "Scientist" }, -/obj/machinery/computer/security, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + icon_state = "white" }, -/area/security/checkpoint/science) -"cPm" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/area/medical/research) +"cPl" = ( +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) +/area/medical/research) "cPn" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -69351,41 +68596,26 @@ /area/medical/medbay) "cPO" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "psychoffice"; + name = "Privacy Shutters"; + opacity = 0 }, /turf/simulated/floor/plating, -/area/security/checkpoint/medical) -"cPP" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/computer/secure_data, -/obj/machinery/door_control{ - id = "medbayfoyer"; - layer = 3.3; - name = "Medbay Foyer Doors"; - normaldoorcontrol = 1; - pixel_x = -25 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/area/medical/psych) "cPQ" = ( -/turf/simulated/floor/plasteel, -/area/security/checkpoint/medical) +/turf/simulated/floor/carpet, +/area/medical/psych) "cPR" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" +/obj/item/twohanded/required/kirbyplants, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, -/area/security/checkpoint/medical) +/turf/simulated/floor/carpet, +/area/medical/psych) "cPS" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -69675,32 +68905,18 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +/obj/machinery/door/airlock/research{ + name = "Research Break Room"; + req_access_txt = "47" }, -/area/security/checkpoint/science) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "cQx" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -69991,35 +69207,42 @@ }, /area/maintenance/port) "cQZ" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cRa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/science) -"cRb" = ( -/obj/machinery/computer/mecha, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + icon_state = "white" }, -/area/security/checkpoint/science) +/area/medical/research) +"cRb" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/medical/research) "cRc" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/security/checkpoint/science) +/area/medical/research) "cRd" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -70126,81 +69349,34 @@ }, /area/medical/medbay) "cRp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable{ d1 = 2; - d2 = 4; - icon_state = "2-4"; + d2 = 8; + icon_state = "2-8"; tag = "" }, -/obj/machinery/computer/security{ - network = list("Medical") +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cRq" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cRr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/structure/closet/secure_closet/psychiatrist, +/obj/item/clipboard{ + pixel_x = -5 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cRs" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cRt" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -70621,42 +69797,14 @@ }, /area/toxins/xenobiology) "cSj" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/newscaster{ + pixel_x = -32 }, -/obj/machinery/power/apc{ +/turf/simulated/floor/plasteel{ dir = 8; - name = "west bump"; - pixel_x = -24 + icon_state = "whitepurple" }, -/obj/machinery/door_timer{ - dir = 10; - id = "scicell"; - name = "Science Cell Timer"; - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint/science) -"cSk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint/science) +/area/medical/research) "cSl" = ( /obj/machinery/light/small{ dir = 1 @@ -70853,45 +70001,33 @@ }, /area/medical/medbay) "cSI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/computer/crew, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cSJ" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/medical/psych) +"cSJ" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cSK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" +/obj/machinery/ai_status_display{ + pixel_x = 32 }, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cSL" = ( /obj/structure/cable{ d1 = 4; @@ -71437,48 +70573,22 @@ }, /area/medical/research) "cTJ" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/structure/chair/comfy/purp, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) -"cTK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/door/window/brigdoor{ - dir = 2; - id = "scicell"; - name = "Science Cell"; - req_access_txt = "1" +/area/medical/research) +"cTL" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light_switch{ + pixel_x = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + dir = 4; + icon_state = "whitepurple" }, -/area/security/checkpoint/science) -"cTL" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) +/area/medical/research) "cTM" = ( /obj/machinery/processor{ desc = "A machine used to process slimes and retrieve their extract."; @@ -71661,51 +70771,27 @@ }, /area/medical/medbay) "cUg" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; pixel_x = -24 }, /obj/machinery/camera{ - c_tag = "Medbay Security Checkpoint"; + c_tag = "Psychiatrist's Office"; dir = 4; network = list("Medical","SS13","Security") }, -/obj/machinery/door_timer{ - dir = 10; - id = "medcell"; - name = "Medical Cell Timer"; - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/obj/structure/cable, +/turf/simulated/floor/wood, +/area/medical/psych) "cUh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/chair/office/light, +/obj/effect/landmark/start{ + name = "Psychiatrist" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cUi" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 4 }, @@ -71713,11 +70799,8 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/turf/simulated/floor/wood, +/area/medical/psych) "cUj" = ( /obj/machinery/light{ dir = 8 @@ -72303,72 +71386,26 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, /area/toxins/xenobiology) -"cVi" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) "cVj" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair{ - dir = 4 - }, +/obj/structure/table/wood, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" + dir = 8; + icon_state = "whitepurple" }, -/area/security/checkpoint/science) -"cVk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint/science) +/area/medical/research) "cVl" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/closet/secure_closet/brig{ - id = "scicell" +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24; + pixel_y = -1 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cVm" = ( /obj/machinery/smartfridge/secure/extract, /obj/machinery/light_switch{ @@ -72409,17 +71446,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) -"cVp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - id_tag = "scicell"; - name = "Security Checkpoint"; - req_access_txt = "1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint/science) "cVq" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -72650,44 +71676,19 @@ }, /area/medical/medbay) "cVQ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 5 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/door/window/brigdoor{ - dir = 2; - id = "medcell"; - name = "Medical Cell"; - req_access_txt = "1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint/medical) +/obj/item/pen/multi, +/turf/simulated/floor/wood, +/area/medical/psych) "cVR" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/storage/briefcase, +/turf/simulated/floor/wood, +/area/medical/psych) "cVS" = ( /obj/structure/cable{ d1 = 1; @@ -72928,24 +71929,23 @@ }, /area/maintenance/port) "cWu" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /obj/machinery/camera{ - c_tag = "Research Security Checkpoint"; + c_tag = "Research Break Room"; dir = 8; network = list("Research","SS13","Security") }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 }, -/area/security/checkpoint/science) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/medical/research) "cWv" = ( /obj/structure/cable{ d1 = 2; @@ -73186,31 +72186,31 @@ }, /area/toxins/lab) "cWN" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/chair/comfy/purp{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 10; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cWO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, +/obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cWP" = ( +/obj/structure/table/wood, +/obj/machinery/kitchen_machine/microwave{ + pixel_x = -3; + pixel_y = 6 + }, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "red" + icon_state = "whitepurple" }, -/area/security/checkpoint/science) +/area/medical/research) "cWQ" = ( /obj/machinery/r_n_d/destructive_analyzer, /obj/effect/decal/warning_stripes/northwest, @@ -73314,7 +72314,7 @@ "cXd" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera{ - c_tag = "Central Hallway South"; + c_tag = "Central Hallway South 1"; dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -73423,6 +72423,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73455,72 +72456,6 @@ icon_state = "whiteblue" }, /area/medical/medbay) -"cXs" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) -"cXt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cXu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cXv" = ( -/obj/structure/closet/secure_closet/brig{ - id = "medcell" - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cXw" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) "cXy" = ( /obj/structure/cable{ d1 = 1; @@ -73846,21 +72781,6 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"cYp" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) "cYq" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -74061,63 +72981,25 @@ }, /area/medical/medbay) "cYP" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) -"cYQ" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint/medical) +/turf/simulated/wall, +/area/medical/psych) "cYR" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/light{ + dir = 1; + on = 1 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" +/obj/machinery/status_display{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "red" + icon_state = "freezerfloor" }, -/area/security/checkpoint/medical) +/area/medical/medbay) "cYS" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint/medical) -"cYT" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) +/obj/structure/curtain/open/shower, +/obj/machinery/shower, +/turf/simulated/floor/noslip, +/area/medical/medbay) "cYU" = ( /obj/structure/cable{ d1 = 1; @@ -74522,20 +73404,17 @@ }, /area/medical/research) "cZH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74565,33 +73444,11 @@ icon_state = "whitebluecorner" }, /area/medical/medbay) -"cZK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint/medical) "cZL" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/medical/medbay) "cZM" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -75267,20 +74124,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/medical/chemistry) -"dbf" = ( -/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{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay) "dbg" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, @@ -75299,15 +74142,6 @@ }, /area/medical/medbay) "dbj" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -75788,7 +74622,10 @@ /area/medical/medbay) "dcj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -75903,14 +74740,15 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ + dir = 1; icon_state = "white" }, /area/medical/medbay) @@ -76292,13 +75130,12 @@ /turf/simulated/floor/plating, /area/medical/research) "ddd" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/chair{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dde" = ( @@ -76348,19 +75185,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 }, @@ -76369,6 +75203,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" @@ -77450,21 +76287,6 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"dfn" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dfo" = ( /turf/simulated/wall/r_wall, /area/assembly/chargebay) @@ -77620,6 +76442,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "63" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -79050,7 +77886,7 @@ "diu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera{ - c_tag = "Brig Security Equipment Lockers"; + c_tag = "Central Hallway South 2"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -79820,9 +78656,9 @@ }, /area/medical/research) "djM" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /obj/structure/cable{ d1 = 2; @@ -80379,7 +79215,6 @@ }, /area/medical/research) "dkW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -80554,12 +79389,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; initialize_directions = 11 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/hallway/secondary/exit) "dlq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -80670,7 +79507,6 @@ }, /area/crew_quarters/fitness) "dlD" = ( -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 @@ -80678,7 +79514,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/hallway/secondary/exit) "dlE" = ( /obj/structure/disposalpipe/segment, @@ -83444,7 +82283,6 @@ }, /area/hallway/primary/aft) "drN" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85728,7 +84566,7 @@ "dwu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera{ - c_tag = "Mining Dock External"; + c_tag = "Central Hallway South 3"; dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -86281,7 +85119,6 @@ }, /area/medical/research) "dxx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -86294,8 +85131,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86969,7 +85804,6 @@ /turf/simulated/floor/plating, /area/toxins/server) "dyL" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -87603,21 +86437,12 @@ }, /area/crew_quarters/hor) "dzT" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "1-4"; + tag = "90Curve" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -88278,8 +87103,8 @@ tag = "" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Science Break Room"; +/obj/machinery/door/airlock/maintenance{ + name = "Science Maintenance"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/south, @@ -88523,28 +87348,14 @@ }, /area/hallway/primary/aft) "dBR" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/light{ dir = 1; - initialize_directions = 11 + on = 1 }, -/turf/simulated/floor/plasteel, -/area/maintenance/apmaint) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/hallway/primary/aft) "dBS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -88949,61 +87760,33 @@ pixel_y = 27 }, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/maintenance/apmaint) "dCP" = ( -/obj/structure/table/wood, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 +/obj/structure/chair/wood{ + dir = 4 }, -/obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "dCQ" = ( /obj/structure/table/wood, -/obj/item/storage/box/donkpockets, -/obj/structure/sign/poster/official/report_crimes{ - pixel_y = 32 +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "dCR" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 28 +/obj/structure/chair/wood{ + dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/medical/research) -"dCS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/medical/research) -"dCT" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "neutral" - }, -/area/medical/research) +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dCU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -89136,22 +87919,9 @@ }, /area/hallway/primary/aft) "dDe" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Customs Desk"; - req_access_txt = "19" - }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/bridge) +/turf/simulated/wall, +/area/hallway/primary/aft) "dDf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89628,10 +88398,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/toxins/storage) -"dEb" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/medical/research) "dEc" = ( /obj/structure/chair{ dir = 4 @@ -89639,66 +88405,6 @@ /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel/airless, /area/toxins/test_area) -"dEd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/medical/research) -"dEe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dEf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dEg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dEh" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/medical/research) "dEi" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -89944,54 +88650,24 @@ pixel_y = 2 }, /turf/simulated/floor/plating, -/area/medical/research) +/area/maintenance/apmaint) "dEN" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/wood, +/obj/machinery/kitchen_machine/microwave{ + pixel_x = -3; + pixel_y = 6 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/medical/research) -"dEO" = ( -/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 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) +/area/maintenance/apmaint) "dEP" = ( -/obj/effect/landmark/start{ - name = "Scientist" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/medical/research) -"dEQ" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) +/area/maintenance/apmaint) "dER" = ( /obj/machinery/camera{ c_tag = "Experimention Lab"; @@ -90017,7 +88693,6 @@ dir = 4; pixel_x = -24 }, -/obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 }, @@ -90026,46 +88701,36 @@ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "blue" + icon_state = "grimy" }, -/area/bridge) +/area/hallway/primary/aft) "dEU" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "blue" +/obj/effect/landmark/start{ + name = "Civilian" }, -/area/bridge) +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dEV" = ( -/obj/machinery/photocopier, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32; +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/pipe, +/obj/item/storage/box/matches, +/obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "blue" +/obj/machinery/camera{ + c_tag = "Central Hallway South 4" }, -/area/bridge) +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dEW" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 28 +/obj/structure/chair/comfy/brown{ + dir = 8 }, -/obj/structure/filingcabinet/security, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "blue" - }, -/area/bridge) +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dEX" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -90084,22 +88749,17 @@ "dEZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dFa" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "escape" + icon_state = "grimy" }, /area/hallway/primary/aft) "dFb" = ( -/obj/item/paper_bin, -/obj/structure/table, -/obj/item/pen, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -90109,7 +88769,7 @@ /obj/machinery/alarm{ pixel_y = 24 }, -/obj/effect/decal/warning_stripes/yellow, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dFc" = ( @@ -90191,47 +88851,22 @@ }, /area/toxins/storage) "dFo" = ( -/obj/machinery/vending/coffee, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/medical/research) -"dFp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dFq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dFr" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/medical/research) -"dFs" = ( /obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_x = 32 +/obj/item/storage/box/donkpockets, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) +"dFr" = ( +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, -/obj/item/clipboard, -/obj/item/folder, +/area/maintenance/apmaint) +"dFs" = ( +/obj/structure/table_frame/wood, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "dFt" = ( /obj/structure/cable{ d1 = 1; @@ -90247,29 +88882,19 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dFu" = ( -/obj/machinery/computer/med_data, /obj/machinery/status_display{ pixel_x = -32 }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "blue" + icon_state = "grimy" }, -/area/bridge) +/area/hallway/primary/aft) "dFv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/bridge) +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dFw" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/polarized{ @@ -90286,14 +88911,17 @@ }, /area/assembly/robotics) "dFx" = ( -/obj/structure/table/reinforced, -/obj/item/stack/packageWrap, -/obj/item/hand_labeler, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "blue" +/obj/structure/chair/comfy/brown{ + dir = 8 }, -/area/bridge) +/obj/effect/landmark/start{ + name = "Civilian" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dFy" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -90316,10 +88944,7 @@ }, /area/assembly/robotics) "dFB" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow, +/obj/structure/chair, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dFC" = ( @@ -90425,14 +89050,6 @@ icon_state = "grimy" }, /area/library/abandoned) -"dFT" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Science Break Room"; - req_access_txt = "47" - }, -/turf/simulated/floor/plasteel, -/area/medical/research) "dFU" = ( /obj/structure/chair{ dir = 1 @@ -90480,16 +89097,13 @@ /area/maintenance/apmaint) "dFZ" = ( /obj/machinery/light/small, -/obj/machinery/newscaster{ - pixel_x = -32 - }, /obj/structure/toilet{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/maintenance/apmaint) "dGa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -90501,46 +89115,17 @@ }, /turf/simulated/floor/plating, /area/medical/cmo) -"dGb" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/medical/research) "dGc" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/vending/cola, -/obj/machinery/light, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/medical/research) -"dGd" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/medical/research) +/area/maintenance/apmaint) "dGe" = ( /obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "neutral" - }, -/area/medical/research) +/obj/effect/spawner/lootdrop/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dGf" = ( /turf/simulated/floor/plasteel, /area/maintenance/apmaint) @@ -90557,110 +89142,31 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dGh" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; pixel_x = -24 }, -/obj/machinery/computer/card, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "bluefull" + icon_state = "grimy" }, -/area/bridge) -"dGi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/bridge) -"dGj" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/bridge) -"dGk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "bluefull" - }, -/area/bridge) +/area/hallway/primary/aft) "dGl" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/item/pen, -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; - name = "Security Desk"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel, -/area/bridge) +/area/hallway/primary/aft) "dGm" = ( -/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/vending/snack, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dGn" = ( @@ -90686,13 +89192,9 @@ }, /area/hallway/primary/aft) "dGp" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Civilian" - }, -/obj/effect/decal/warning_stripes/yellow, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dGr" = ( @@ -90939,42 +89441,20 @@ }, /area/toxins/storage) "dGP" = ( -/obj/machinery/computer/crew, /obj/machinery/ai_status_display{ pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "blue" - }, -/area/bridge) -"dGQ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge) -"dGR" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/bridge) +/area/hallway/primary/aft) "dGS" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "blue" + dir = 8; + icon_state = "neutralfull" }, -/area/bridge) +/area/hallway/primary/aft) "dGT" = ( /obj/structure/closet/wardrobe/robotics_black, /obj/structure/window/reinforced{ @@ -91032,10 +89512,10 @@ /area/maintenance/starboardsolar) "dGY" = ( /obj/machinery/door/airlock/maintenance{ - name = "Science Toilet" + name = "abandoned Toilet" }, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/maintenance/apmaint) "dGZ" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -91436,29 +89916,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/apmaint) -"dHI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/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/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/apmaint) "dHJ" = ( /obj/structure/cable{ d1 = 4; @@ -91534,48 +89991,19 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dHN" = ( -/obj/structure/table/reinforced, -/obj/item/radio, -/obj/item/crowbar, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "blue" - }, -/area/bridge) -"dHO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/table/reinforced, -/obj/item/storage/box/ids, -/turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "blue" - }, -/area/bridge) -"dHP" = ( -/turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "blue" - }, -/area/bridge) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "dHQ" = ( -/obj/machinery/newscaster{ - pixel_x = 32 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/structure/closet/secure_closet, -/obj/item/storage/secure/briefcase, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "blue" - }, -/area/bridge) +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "dHR" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/polarized{ @@ -91593,40 +90021,33 @@ }, /area/assembly/robotics) "dHS" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "escape" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/obj/machinery/vending/cigarette, +/turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dHT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dHU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 8 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "escape" +/obj/structure/sign/directions/medical{ + dir = 1 }, -/area/hallway/primary/aft) +/obj/structure/sign/directions/evac{ + pixel_y = -8 + }, +/turf/simulated/wall, +/area/hallway/secondary/exit) "dHV" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dHX" = ( @@ -91913,16 +90334,13 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "dIC" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/wardrobe/toxins_white, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "dID" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -91949,22 +90367,17 @@ /turf/simulated/wall, /area/hallway/secondary/exit) "dII" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/public/glass, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dIJ" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/public/glass, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dIK" = ( /obj/structure/sign/directions/engineering{ @@ -91996,17 +90409,12 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "dIN" = ( -/obj/structure/sign/directions/evac{ - pixel_y = -8 +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/obj/structure/sign/directions/medical{ - dir = 1 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = 8 - }, -/turf/simulated/wall, +/turf/simulated/floor/plating, /area/hallway/secondary/exit) "dIO" = ( /obj/effect/spawner/window/reinforced, @@ -92277,25 +90685,23 @@ /turf/simulated/wall, /area/chapel/main) "dJy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Break Room Maintenance"; - req_access_txt = "47" - }, -/turf/simulated/floor/plasteel, +/obj/structure/barricade/wooden, +/turf/simulated/floor/plating, /area/maintenance/apmaint) "dJA" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = 32 +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Departure Lounge Security" + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = 25 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "red" }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dJB" = ( /obj/structure/cable{ @@ -92338,13 +90744,14 @@ }, /area/medical/medbay) "dJF" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dJG" = ( -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, /area/hallway/secondary/exit) "dJH" = ( /obj/item/twohanded/required/kirbyplants, @@ -92628,13 +91035,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dKq" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dKr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -93195,25 +91595,11 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/machinery/door/airlock/public/glass, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLE" = ( /obj/structure/disposalpipe/segment{ @@ -93231,22 +91617,28 @@ }, /area/hallway/secondary/exit) "dLF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/exit) "dLG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93254,20 +91646,41 @@ }, /area/hallway/secondary/exit) "dLH" = ( -/obj/structure/disposalpipe/sortjunction{ - name = "Chapel Junction"; - sortType = 17 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLI" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall8"; location = "hall7" }, +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "63" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -93277,7 +91690,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, +/obj/effect/turf_decal/plaque{ + desc = "NanoTrasen Science Station Kerberos: Comissioned in 2557."; + name = "NSS Kerberos dedication plaque" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLP" = ( @@ -93451,6 +91867,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMp" = ( @@ -93459,33 +91878,21 @@ initialize_directions = 11 }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dMq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dMr" = ( /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMs" = ( /obj/structure/disposalpipe/segment{ @@ -93495,9 +91902,16 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "red" }, /area/hallway/secondary/exit) "dMu" = ( @@ -93843,16 +92257,16 @@ }, /area/chapel/main) "dMY" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) "dNa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -94120,7 +92534,13 @@ /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/full/basic, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 8 + }, /turf/simulated/floor/grass, /area/hallway/secondary/exit) "dNO" = ( @@ -94132,7 +92552,10 @@ /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/fernybush, -/obj/structure/window/full/basic, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hallway/secondary/exit) "dNQ" = ( @@ -94465,6 +92888,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -94718,15 +93142,8 @@ }, /area/chapel/main) "dPa" = ( -/obj/structure/chair, -/obj/effect/landmark/start{ - name = "Civilian" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dPb" = ( /obj/structure/closet/emcloset, @@ -94853,7 +93270,6 @@ /area/maintenance/apmaint) "dPu" = ( /obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95465,6 +93881,7 @@ /obj/structure/table, /obj/item/storage/firstaid/regular, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -95503,15 +93920,13 @@ }, /area/medical/virology) "dQI" = ( -/obj/machinery/door/airlock/external{ - hackProof = 1; - id_tag = "emergency_home"; - locked = 1; - name = "Escape Airlock" +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light{ + dir = 1; + on = 1 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dQJ" = ( /obj/structure/cable{ d2 = 8; @@ -95716,6 +94131,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, @@ -96263,6 +94679,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSp" = ( @@ -96296,22 +94715,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"dSu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/camera{ + c_tag = "Departure Lounge North"; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSA" = ( @@ -96330,10 +94737,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSC" = ( @@ -96351,18 +94758,16 @@ }, /area/medical/surgery) "dSD" = ( -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"dSE" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/hallway/secondary/exit) "dSF" = ( /obj/structure/cable{ @@ -96455,8 +94860,9 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dSP" = ( -/turf/simulated/wall, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dSQ" = ( /obj/structure/cable{ d1 = 1; @@ -96471,58 +94877,38 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) -"dSR" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/checkpoint) -"dSS" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/checkpoint) "dST" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dSU" = ( -/obj/machinery/status_display, -/turf/simulated/wall, -/area/security/checkpoint) +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dSV" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/structure/disposalpipe/segment, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 }, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint) +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "red" + }, +/area/hallway/secondary/exit) "dSW" = ( /obj/structure/cable{ d1 = 4; @@ -96533,46 +94919,33 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) -"dSX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint) "dSY" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 }, /turf/simulated/floor/plating, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dSZ" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/floor/plating, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dTa" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/checkpoint) +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) "dTe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -96624,20 +94997,26 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dTi" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint"; - req_access_txt = "1" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "red" }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dTj" = ( /obj/machinery/light{ dir = 8 @@ -96645,29 +95024,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/maintenance/apmaint) -"dTk" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "63" - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/checkpoint) "dTl" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass, @@ -96853,112 +95209,105 @@ }, /area/medical/medbay) "dTy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/wall, -/area/security/checkpoint) -"dTA" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/chair{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 4; icon_state = "red" }, -/area/security/checkpoint) -"dTB" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" - }, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dTC" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/southright{ - dir = 1; - name = "Security Desk"; - pixel_y = 8; - req_access_txt = "63" - }, -/obj/item/folder/red, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint) -"dTD" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" - }, -/area/security/checkpoint) -"dTE" = ( -/obj/structure/closet/wardrobe/red, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" - }, -/area/security/checkpoint) -"dTF" = ( -/obj/structure/chair, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" - }, -/area/security/checkpoint) -"dTG" = ( -/obj/structure/chair, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint) -"dTH" = ( -/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{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint) -"dTI" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/checkpoint) -"dTJ" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" - }, -/area/security/checkpoint) -"dTK" = ( +/obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/security/checkpoint) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dTE" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/exit) +"dTF" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/hallway/secondary/exit) +"dTG" = ( +/obj/structure/window/basic, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) +"dTH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dTI" = ( +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dTJ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "red" + }, +/area/hallway/secondary/exit) +"dTK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/structure/disposalpipe/sortjunction{ + name = "Chapel Junction"; + sortType = 17 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dTV" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -97081,46 +95430,26 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dUj" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/radio, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/southwestcorner, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dUk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "red" }, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dUl" = ( /obj/structure/cable{ d1 = 1; @@ -97132,20 +95461,78 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dUm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dUn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/chair, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dUo" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ - d1 = 1; + d1 = 2; d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, -/obj/structure/chair/office/dark{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, +/area/hallway/secondary/exit) +"dUp" = ( +/obj/structure/table, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dUq" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/chair, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dUr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/chair, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"dUs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -97156,127 +95543,54 @@ dir = 8; icon_state = "neutralfull" }, -/area/security/checkpoint) -"dUn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, +/area/hallway/secondary/exit) +"dUt" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/security/checkpoint) -"dUo" = ( +/area/hallway/secondary/exit) +"dUu" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/chair{ + dir = 8 + }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, -/area/security/checkpoint) -"dUp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "1" - }, -/turf/simulated/floor/plasteel, -/area/security/checkpoint) -"dUq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/checkpoint) -"dUr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/checkpoint) -"dUs" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, +/area/hallway/secondary/exit) +"dUv" = ( +/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/checkpoint) -"dUt" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/checkpoint) -"dUu" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/checkpoint) -"dUv" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dUD" = ( /obj/structure/closet/secure_closet/CMO, /obj/effect/decal/warning_stripes/northeast, @@ -97445,156 +95759,50 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dUT" = ( -/obj/structure/table/reinforced, -/obj/machinery/newscaster/security_unit{ - pixel_y = -32 - }, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dUU" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "red" + dir = 8; + icon_state = "neutralfull" }, -/area/security/checkpoint) -"dUV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/computer/prisoner, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint) -"dUW" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/computer/secure_data, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/checkpoint) -"dUX" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/computer/security, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dUY" = ( /obj/machinery/light, -/obj/structure/closet/secure_closet/security, /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dUZ" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/light, -/obj/structure/sign/poster/official/report_crimes{ +/obj/machinery/status_display{ pixel_y = -32 }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" - }, -/area/security/checkpoint) -"dVa" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/chair{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dVb" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/table, -/obj/item/restraints/handcuffs, -/obj/item/flash, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dVc" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/southeast, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dVd" = ( /obj/machinery/camera{ c_tag = "Server Room"; @@ -97611,24 +95819,20 @@ }, /area/toxins/server) "dVe" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/security/checkpoint) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dVj" = ( /obj/structure/cable{ d1 = 4; @@ -97666,13 +95870,31 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dVp" = ( -/turf/simulated/wall/r_wall, -/area/security/checkpoint) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dVq" = ( /obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /obj/structure/cable, /turf/simulated/floor/plating, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dVv" = ( /obj/machinery/light{ dir = 8 @@ -97689,18 +95911,18 @@ }, /area/medical/cmo) "dVw" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dVx" = ( -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/table/wood, +/obj/item/ashtray/plastic, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/area/bridge) +/turf/simulated/floor/carpet, +/area/hallway/primary/aft) "dVy" = ( /obj/structure/grille, /obj/structure/cable/yellow{ @@ -97791,7 +96013,6 @@ }, /area/maintenance/port) "dWh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -97806,6 +96027,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" = ( @@ -98028,48 +96250,34 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dWz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/external{ frequency = 1379; id_tag = "arrival_south_inner"; locked = 1; name = "Arrivals External Access" }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dWA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/security/checkpoint) +/area/hallway/secondary/exit) "dWG" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; + dir = 4; frequency = 1379; id_tag = "arrival_south_pump" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "arrival_south_airlock"; - pixel_x = 25; + pixel_x = -26; + pixel_y = 6; tag_airpump = "arrival_south_pump"; tag_chamber_sensor = "arrival_south_sensor"; tag_exterior_door = "arrival_south_outer"; @@ -98077,11 +96285,8 @@ }, /obj/machinery/airlock_sensor{ id_tag = "engineering_west_sensor"; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + pixel_x = -24; + pixel_y = -7 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -98097,13 +96302,16 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dWI" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) +/obj/effect/spawner/window/reinforced, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/hallway/secondary/exit) "dWK" = ( /obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; @@ -98114,13 +96322,17 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/closet/emcloset, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/hallway/primary/aft) "dWM" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/vending/coffee, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dWN" = ( @@ -98354,7 +96566,6 @@ "dXj" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -98382,16 +96593,20 @@ /area/maintenance/apmaint) "dXm" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "63" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dXn" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/airlock/public/glass, -/turf/simulated/floor/plasteel, +/turf/simulated/wall/r_wall, /area/hallway/secondary/exit) "dXo" = ( /obj/structure/cable{ @@ -98512,19 +96727,15 @@ /area/chapel/main) "dXy" = ( /obj/structure/table/wood, -/obj/machinery/camera{ - c_tag = "Research Break Room"; - dir = 8; - network = list("Research","SS13") - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/light/small{ + dir = 4 }, +/obj/item/trash/fried_vox, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "dXz" = ( /obj/item/radio/intercom{ dir = 1; @@ -98636,67 +96847,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/camera{ - c_tag = "Departure Lounge South"; - dir = 1 - }, -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/hallway/secondary/exit) "dXK" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 24 }, -/obj/machinery/camera{ - c_tag = "Departure Lounge Security Checkpoint West"; - network = list("SS13","Security") - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dXQ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/camera{ - c_tag = "Departure Lounge Security Checkpoint East"; - dir = 1; - network = list("SS13","Security") - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint) +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dXS" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -98739,9 +96910,6 @@ dir = 4; pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1379; @@ -99406,13 +97574,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" @@ -99455,6 +97623,20 @@ icon_state = "vault" }, /area/security/securearmoury) +"eFE" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) "eLI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -99613,6 +97795,19 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"fev" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/exit) "feV" = ( /obj/structure/cable{ d1 = 1; @@ -99673,6 +97868,20 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"frp" = ( +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hallway/secondary/exit) "frI" = ( /obj/structure/cable{ d1 = 4; @@ -100004,6 +98213,14 @@ icon_state = "redcorner" }, /area/security/brig) +"gET" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/exit) "gGu" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -100214,21 +98431,23 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "hos" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/medical/psych) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "hzb" = ( /obj/machinery/light{ dir = 4 @@ -100370,6 +98589,15 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"ibQ" = ( +/obj/structure/table, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/storage/box/characters, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "ibR" = ( /obj/effect/decal/warning_stripes/east, /obj/structure/cable{ @@ -100633,6 +98861,12 @@ icon_state = "dark" }, /area/security/processing) +"jkP" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/engine/break_room) "jkU" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, @@ -100733,11 +98967,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" }, @@ -100910,13 +99144,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" }, @@ -101068,9 +99302,6 @@ }, /area/security/brig) "lso" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -101079,6 +99310,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -101429,6 +99663,12 @@ icon_state = "redcorner" }, /area/hallway/primary/starboard) +"muI" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "muK" = ( /obj/structure/sink{ dir = 8; @@ -101460,6 +99700,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"mzQ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/medical/research) "mDm" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -101785,6 +100034,24 @@ icon_state = "red" }, /area/security/seceqstorage) +"nMN" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "63" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "nPe" = ( /obj/structure/cable{ d1 = 1; @@ -102024,12 +100291,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" }, @@ -102108,6 +100375,27 @@ /obj/item/clothing/head/fedora, /turf/simulated/floor/plating, /area/security/detectives_office) +"pGr" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/hallway/secondary/exit) +"pJE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "pOB" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -102286,6 +100574,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" @@ -102468,12 +100759,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" }, @@ -102494,6 +100785,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/warden) +"rmq" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "red" + }, +/area/hallway/secondary/exit) "rnO" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -102509,6 +100806,24 @@ icon_state = "darkblue" }, /area/medical/surgery2) +"rvx" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) +"rCw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "rDp" = ( /obj/structure/cable{ d2 = 4; @@ -102652,6 +100967,17 @@ }, /turf/simulated/floor/plasteel, /area/security/permabrig) +"scA" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/structure/closet/secure_closet/security, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "red" + }, +/area/hallway/secondary/exit) "shi" = ( /obj/structure/cable{ d2 = 2; @@ -102726,6 +101052,18 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"suy" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/camera{ + c_tag = "Departure Lounge North"; + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "swV" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/glowshroom, @@ -102929,6 +101267,15 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"tsN" = ( +/obj/structure/chair/comfy/purp{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/medical/research) "tvq" = ( /obj/structure/table, /obj/item/toy/figure/crew/syndie, @@ -103095,6 +101442,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" @@ -103115,6 +101466,17 @@ }, /turf/simulated/floor/plating, /area/security/range) +"uil" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "uiw" = ( /obj/structure/cable{ d1 = 4; @@ -103162,13 +101524,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" }, @@ -103263,6 +101625,10 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/security/permasolitary) +"uFa" = ( +/obj/effect/decal/warning_stripes/northeastcorner, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "uJk" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle, @@ -103626,6 +101992,15 @@ icon_state = "red" }, /area/security/processing) +"vSW" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "red" + }, +/area/hallway/secondary/exit) "vXX" = ( /turf/space, /area/space/nearstation) @@ -103659,6 +102034,13 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"wgY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "wmQ" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -103849,9 +102231,6 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "xqH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -103943,6 +102322,13 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) +"xKN" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "cmo" + }, +/area/medical/medbay2) "xKW" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/plasteel{ @@ -104069,15 +102455,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" @@ -128889,7 +127275,7 @@ bBA bDs bIx byl -bKi +bIx bKC bIx bGz @@ -129146,8 +127532,8 @@ bBB bLW bIy bGA -bKj -bLW +bIy +blx bNT bGz bQk @@ -129399,11 +127785,11 @@ aOg bwV byt bzS -bBC -bDt bEV +bDt +bQt bQp -bIz +bQt bKl bMo bGz @@ -129654,12 +128040,12 @@ aYK buv aOg bwW -byu -bBm -bBE +bIA +bIA +bIA bDu bEW -bGC +bIA bIA bKp bMp @@ -129895,14 +128281,14 @@ aUc aVI aXp aYG -ban +bdr bbS bdr beM bgf bhn biS -bkG +bkF bmD bnY bpI @@ -129912,9 +128298,9 @@ buw bvK bwX byv -bzT +bKr bBE -bDw +bKp bEX bGD bIA @@ -130158,8 +128544,8 @@ bds beN aOb bhk -biT -bkH +aZm +bkF bmE bnZ bpJ @@ -130171,7 +128557,7 @@ byl byl byl bBF -bDw +bKp bEX bGE bEX @@ -130415,7 +128801,7 @@ aOb aXo aXo bho -biT +aZm bkI bmF boa @@ -130428,7 +128814,7 @@ bwY bOg bzW bBG -bDw +bKp bIA bGF bEX @@ -131207,7 +129593,7 @@ bIA bMv byl bQr -bSj +bWt bUu bWt bQr @@ -131462,8 +129848,8 @@ bGH bIF bKr bMw -bOh bQs +bOn bSk bUv bWu @@ -131717,14 +130103,14 @@ aOg byl bGJ byl -bKs -bMx -bMx -bKs +byl +bQs +bQs bSl +bIA bUw bWv -bMB +bwP bZC cfg cdn @@ -131974,14 +130360,14 @@ aOg bFd bGK bID -bQt +byl bMy -bOk bQt +jkP bSm bUx bWw -bMB +bwP bZD cbv cdo @@ -132221,7 +130607,7 @@ aOg btv btv btv -buF +buD bvQ ban byC @@ -132230,15 +130616,15 @@ bBM aOg bFe bGM -bIH -bIW +bzW +byl bMz -bOl -bQu -bSn -bUy +bIA +bIA +bIA +bGC bWx -bYd +bwP bZD cbw cdp @@ -132488,14 +130874,14 @@ aOg bFf bGL bII -bQv +byl bMA bOm bQv bXE bUz bWy -bMB +bwP bZE cbx cdq @@ -132746,13 +131132,13 @@ bFg bGN bIK bKw -bKs -bKs -bKs -bMB -bMB -bMB -bMB +byl +bQs +bQs +bQs +byl +byl +bwP bXU bXU bXU @@ -133003,8 +131389,8 @@ bty bGO bWz bWz +bOh bWz -bOn bWz bWz bUA @@ -134573,7 +132959,7 @@ czx cAS cAS cDR -cEE +cly cGn dmq cIM @@ -134829,7 +133215,7 @@ bYj bYj bYj bYj -cDS +drn dhG cGo dmq @@ -135086,9 +133472,9 @@ cxV czy bZK bYj -cDT +dhG dlM -bGr +cGe dmq cIM cIM @@ -135343,9 +133729,9 @@ cxW crn cAT bYj -cDU +czF drn -deO +cGi dmq cSq cKn @@ -135600,9 +133986,9 @@ cxX czA ctH bYj -cDS drn -deO +drn +cGi dmq cIM cIM @@ -135857,9 +134243,9 @@ cxY czA cAU bYj -cDS +drn drs -deO +cGi dmq cIL cIL @@ -136075,10 +134461,10 @@ aEu aMZ bqg brZ -aty -aty -apU -aIQ +aEu +aEu +aOv +bkG byJ bAl apU @@ -136114,9 +134500,9 @@ cxZ crn cAV bYj -cDS +drn dlM -deO +cGi dmq cIO cIO @@ -136336,7 +134722,7 @@ baF baF baF baF -aDt +bqe bOC bOC bOC @@ -136371,7 +134757,7 @@ bAa ctO cAW bYj -cDT +dhG dmy cGp dmq @@ -136593,7 +134979,7 @@ bmQ buP bvZ baF -aDt +bqe bOC bBX bDP @@ -136850,7 +135236,7 @@ bkT buQ bwa baF -aDw +aXJ bOC bBY bDK @@ -136885,9 +135271,9 @@ cyb ctO cAY bYj -cDS +drn dlM -bGr +cGe dmq cIO bQx @@ -137107,7 +135493,7 @@ bkU beU bwa baF -aEz +bpZ bOC bBZ bDL @@ -137142,9 +135528,9 @@ bYj bYj cFM bYj -cDT +dhG drn -deO +cGi dmq cIO cIO @@ -137400,7 +135786,7 @@ drn cDZ cCB cDW -drn +cDW cGr dmq dmq @@ -137878,7 +136264,7 @@ bmR beU bwa baF -byM +aEy bOC bCc bDN @@ -137913,14 +136299,14 @@ bYj czF cBb cHr -cDY +dlM drn cGt cHx cXU cZt dau -dau +mzQ dau dau dau @@ -138135,7 +136521,7 @@ bmU buR bwa baF -bpZ +aEz bOC bCd bDO @@ -138170,8 +136556,8 @@ bYj drn cHr drn -cDZ -cEH +drn +dhG cGu cHy cly @@ -138392,7 +136778,7 @@ btD buS bwb baF -bqe +aDt bOC bCg bDS @@ -138649,7 +137035,7 @@ bgp buT baF baF -btF +bkH bOC bCe bDQ @@ -138689,16 +137075,16 @@ cHA cIz cHA cHA -cLZ -cLZ -cNz +cZt +cZt +cZt cQw -cRc -cLZ -cLZ -cVi -cRc -cLZ +cZt +cZt +cIW +cIW +cIW +cZt cZt cZu cZy @@ -138932,21 +137318,21 @@ 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 -cLZ +cZt cMa cNA cPj @@ -138955,7 +137341,7 @@ cSj cTJ cVj cWN -cTJ +cIW cYv cKF dbV @@ -138978,13 +137364,13 @@ dwi dwi dwi dwi -cKr -cKr -cKr -cKr -cKr -cZt -dbM +dFm +dFm +dFm +dFm +dFm +ddy +dku dHE dEi dJx @@ -139158,13 +137544,13 @@ blc bmX bom bqn -buV -btE -buV -buV -buV +bva +bSi +bva +bva +bva byP -buV +bva bCf bva bFs @@ -139203,16 +137589,16 @@ cDd cGy xqH ddm -cLZ +cZt cMb cNB cPk cRa -cSk -cTK -cVk +muI +cMm +cMm cWO -cYp +cIW cYz cKF dbV @@ -139237,11 +137623,11 @@ dzP dBd cKr dCO -dEb +dCU dEL dGY dFZ -dbM +dku dHL dIA dJx @@ -139414,17 +137800,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 +137831,7 @@ ckm bIX bIX bSz -cpO +bqp crr cEL ctQ @@ -139457,19 +137843,19 @@ cEL cEL cEL cEL -bqu +btE cHC ddn -cLZ +cZt cMc -cNC cPl +tsN cRb cWu cTL cVl cWP -cTL +cIW cYA cKF dbV @@ -139493,12 +137879,12 @@ dyJ dzQ dBe cKr -cZt -dFT -cZt -cZt -cZt -cZt +ddy +dGf +ddy +ddy +ddy +ddy dPw dID dJx @@ -139671,8 +138057,8 @@ bjp bQc aYZ boo -bqp -bsg +bqu +bhX bsv bvV bxi @@ -139717,16 +138103,16 @@ cFp dxV ddl cIV -cLZ -cLZ -cNz -cPm +cZt +cIW +cIW +cIW cRc -cLZ -cLZ -cTL -cVp -cLZ +cZt +cZt +cZt +cZt +cZt cZt dtS dbV @@ -139751,11 +138137,11 @@ dVd dBf cKr dCP -dEd +ddv dEN dFo dIC -cZt +ddy dHH dKZ dXa @@ -139928,17 +138314,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 +138345,7 @@ ckn clI cno bSE -cpT +bqr cry csK ctR @@ -139978,7 +138364,7 @@ cKw cMd cND cPn -cRd +aKA cSm cZt cTU @@ -140008,12 +138394,12 @@ dwi dwi cKr dCQ -dEe -dEO -dFp -dGb +dEP +dFr +dFr +dGc dJy -dHI +dHE dID dJx dKk @@ -140185,17 +138571,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 +138602,7 @@ cko clJ cnp bSE -cpT +bqr cry csK cBi @@ -140235,7 +138621,7 @@ cKx cMe cMf cPo -cRe +aKC cSn cTB cUY @@ -140265,11 +138651,11 @@ dXv cRd cZt dCR -dEf +dFr dEP -dFq +dOO dGc -cZt +ddy dHJ dbp dJx @@ -140442,8 +138828,8 @@ bjs blh aYZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -140451,7 +138837,7 @@ aaa bwf aot bCk -bDW +bEk asz bHj bJa @@ -140517,16 +138903,16 @@ dyL dkW cZH dxx -dyL +cNx dzT dbj dBh -dCS -dEg -dEQ +dik dFr -dGd -cZt +dOO +dFr +dID +ddy ddt dOO dJx @@ -140699,8 +139085,8 @@ bjt blj aYZ bop -bqp -bqv +bqu +bIX btH aaa abj @@ -140708,7 +139094,7 @@ aaa bwf bAt bCl -bDX +byU bFx bHk bJb @@ -140730,7 +139116,7 @@ ckp clL bUT bSE -cpT +bqr cry csK cEs @@ -140778,12 +139164,12 @@ cSt dzU cSt cZt -dCT -dEh +dCJ +dcQ dXy dFs dGe -cZt +ddy dHK dIE dJx @@ -140956,7 +139342,7 @@ aYC blk aYZ boo -bqp +bqu bsi bsv abj @@ -140965,7 +139351,7 @@ abj bwf bAu bCl -bDX +byU bFy bHk bJc @@ -140975,9 +139361,9 @@ bOI bQH ciB bUR -bZY +chi bYs -bZY +chi bYs cnv bYs @@ -141035,12 +139421,12 @@ dql dql dql cZt -cZt -cZt -cZt -cZt -cZt -dbM +ddy +ddy +ddy +ddy +ddy +dku dHA ddy dJx @@ -141213,8 +139599,8 @@ aYE bll bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -141231,7 +139617,7 @@ bMQ bOF bKN ciB -bUS +bWR bWT cbT chi @@ -141244,7 +139630,7 @@ ckr clN cnr bSE -cpT +bqr crw csK cEs @@ -141471,7 +139857,7 @@ blm bmZ boq bqq -bqv +bIX btH aaa abj @@ -141480,7 +139866,7 @@ bwf aos bCn bDZ -bFA +bFP bHl bJe bKL @@ -141565,18 +139951,18 @@ dMp dPM dPM dPM -dPM +rCw dPM dPM dPM dPM dkq dSs -dSP -dTy -dSP -dSP -dVp +dIH +dIH +dIH +uil +dIH abj abj aaa @@ -141727,8 +140113,8 @@ aYE blo bmZ boo -bqp -bqv +bqu +bIX btH aaa abj @@ -141807,22 +140193,22 @@ dGT dql dCU dCW -aos -aos -aos -aos -aos -aos +dfu +dfu +dfu +dfu +dfu +dfu dIH dJC dKo dKo dLE -dMq -dKo +dXJ dKo dKo dKo +rvx dKo dKo dKo @@ -141831,9 +140217,9 @@ dKo dSB dSP dXK -dUj -dUT -dVp +dIH +dIH +dIH abj abi abj @@ -141984,7 +140370,7 @@ aZk bln aZa bor -bqr +dxV bsj bsv abj @@ -142064,33 +140450,33 @@ dtN dyP dBC dbB -aos +dfu dET dFu dGh dGP dHN +dHU +dQI +dKo +dKo +dLE +dXJ +dNa +dNa +dNa +dKo +dKo +dNa +dNa +dNa +dKo +dXJ +dKo +dUj +dSP +dUT dIH -dJD -dKo -dKo -dLD -dfn -dNa -dNa -dNa -dKp -dKp -dNa -dNa -dNa -dKp -dSu -dTi -dTA -dUk -dUU -dVq abj abj aaa @@ -142241,8 +140627,8 @@ bjw bnc bmZ boo -bqp -bqv +bqu +bIX btH aaa bwc @@ -142320,19 +140706,19 @@ dFw dHR dql dGf -dBR +dBT dDe dEU dFv -dGi -dGQ -dHO +dGl +dGS +dHT dII dJD dKo dKo dLE -dMq +dXJ dNb dNN dOw @@ -142342,12 +140728,12 @@ dNb dNN dOw dKo -dSB -dSR -dTB +dXJ +dKo +dKo dWA -dUV -dVq +dVb +dIO aaa abj aaa @@ -142498,8 +140884,8 @@ bdQ bne bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -142578,18 +140964,18 @@ dzY dql dCU dHL -aos +dfu dEV dVx -dGj -dGR -dHP +dGl +dGS +dHT dIJ dJD dKo dKo dLE -dMq +dXJ dNc dNO dXF @@ -142600,11 +140986,11 @@ dNO dRG dKo dlp -dSS +dTC dTC dUm -dUW -dVq +dVb +dIO abj abj aaa @@ -142755,8 +141141,8 @@ bdP bQy bmZ boo -bqp -bqv +bqu +bIX btH aaa bwd @@ -142835,33 +141221,33 @@ dzZ dql dGf dBT -aos +dfu dEW dFx -dGk +dGl dGS dHQ -dIH -dJD -dKo -dKo -dLE -dMq -dNb -dNP -dOw -dKo -dKo -dNb -dNP -dOw -dKo -dSB +dLD dST -dTD +dSZ +dSZ +dTK +dUU +dNb +dNP +dOw +dKo +dKo +dNb +dNP +dOw +dKo +dXJ +dNb +dTG dUn -dUX -dVp +dVb +dIO abj abi abj @@ -143012,8 +141398,8 @@ bjy bQy aYZ ibc -bqp -bqv +bqu +bIX btH aaa bwe @@ -143092,18 +141478,18 @@ dQq dql dfu dVj -aos -aos -aot +dfu +dBR +dFa dGl -asz -aos +dGS +dGm dIH dXC dKp dKp dLF -dMq +dVe dOu dNQ dOx @@ -143113,12 +141499,12 @@ dQF dNQ dRH dKo -dSB +dXJ dSU -dTE -dUo +dNQ +dOw dUY -dVp +dIH abj abi aaa @@ -143269,7 +141655,7 @@ bnb aYZ bna boo -bqp +bqu bsi bsv abj @@ -143351,31 +141737,31 @@ dBH dCX dfu dVw -dWI -dGm +dcV +dGU dWL dWM dIK -dJD +dQI dKo dKo dLG -dMq +dVe dNb -dNN +bGr dOw dKo dKo dNb -dNN +dMY dOw dKo dXJ -dSP +ibQ dTa dUp -dTa -dVp +suy +dIH abj abi aaa @@ -143607,32 +141993,32 @@ doY doY dDb dXj -dFa -dGo -dGo +dnD +dcV +dGU dGU dHS -dXm +dIH dJF -dKq -dKq +dPa +dPa dLH dMr -dNc -dNO dPa -dKo +dPa +dPa +uFa dKo dNb dNO dRG -dKo -dSB -dSR -dTF +wgY +pJE +dSU +dNO dUq dUZ -dVp +dIH abj abi abj @@ -143772,12 +142158,12 @@ aTj aWm aZe aZe -aZe -aZe +aXX +aXX bgw -aIg -aZe -aZe +aXZ +aXX +aXX bhP bjB bar @@ -143870,26 +142256,26 @@ dWK dcS dHT dXn -dJD -dKo -dKo +dXn +dXn +dTF dLI dfG -dNb -dNP -dOw -dKo +dWI +dXn +dXn +dQI dKo dNb -dNP +eFE dOw dKo dSD -dSV -dTG +dNb +frp dUr -dVa -dVq +dVb +dIO abj abj aaa @@ -144040,7 +142426,7 @@ bhY bSB bMb bov -bqu +aXY bsm btH aaa @@ -144121,32 +142507,32 @@ dBj dBQ dDd dXj -dFa +dnD dGo dGo dcV -dHU +dnD dXm -dJF -dKq -dKq -dKq +dSV +dTi +dTJ +dUk dMs -dKo -dKo -dKo -dKo +vSW +scA +gET +dJD dKo dKo dRn dKo dRV dlD -dTk +dTH dTH dUs dVb -dVq +dIO aaa abj aaa @@ -144297,7 +142683,7 @@ bfq bdU bnd bov -bqu +aXY bsn bsv abj @@ -144385,25 +142771,25 @@ ddd dHV dIN dJG -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dMY -dSE -dSX +dKo +dKo +dUo +dVp +dKp +pGr +nMN +dJF +dTI +dTI +dTI +dTI +dTI +dTI +dTI dTI dUt dVc -dVq +dIO abj abj aaa @@ -144554,8 +142940,8 @@ bjC bls bfq bov -bqu -ckH +aXY +bwm btH aaa bwj @@ -144640,27 +143026,27 @@ dFC dFC dFC dfu -dIH +dXn dJA -dJH -dKP -dLK -dKP -dKP -dKP -dKP -dKP -dKP -dKP -dLK -dKP -dKP -dKP -dSY -dTJ +dTy +dTy dUu +dTy +dTy +rmq +fev +dKP +dKP +dKP +dLK +dKP +dKP +dKP +dKP +dKP +dKP dXQ -dVp +dIH abj abi abj @@ -144811,8 +143197,8 @@ bfu blt bfq bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -144897,27 +143283,27 @@ abj aaa abj aaa -dIO -dIO -dIO -dIO -dIO -dIO -dIO -dKQ -dIO -dKQ -dIO -dIO -dIO -dIO -dIO -dKQ -dSZ -dQI +dXn +dSY +dTE +dTE dUv -dVe dVq +dWI +dKQ +dIN +dKQ +dIO +dIO +dIO +dIO +dIO +dKQ +dIO +dKQ +dIO +dIO +dIO abj abi aaa @@ -145068,8 +143454,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwk @@ -145170,9 +143556,9 @@ abj abj dIO dKP -dTa -dTK -dTa +dIO +dKP +dIO abj aaa aaa @@ -145325,8 +143711,8 @@ bfu blu bhU bov -bqu -ckH +aXY +bwm btH aaa bwl @@ -145427,9 +143813,9 @@ aaa aaa dIO dKQ -dTa -dQI -dTa +dIO +dKQ +dIO aaa aaa aaa @@ -145582,7 +143968,7 @@ bfu blw bdU bgX -dxV +bfy bML bsv abj @@ -145814,7 +144200,7 @@ aBJ aCD aCf aDO -aFE +aGO aGL aHZ aJh @@ -145835,12 +144221,12 @@ bcB bfu bea bgF -aZm -blx -bhX -aXX +bfu +blu +bhU +bov aXY -aXZ +bwm btH aaa abj @@ -146072,15 +144458,15 @@ aCE aDN aDP aFI -aGO -aGO -aJi -aKA +ayD +ayD +aFR +aFR aOw -aGO -aGO -aQj -aMb +ayD +ayD +aFR +aFR aTn aUT aWs @@ -146097,7 +144483,7 @@ blu bhU box bqx -ckH +bwm btH aaa abj @@ -146328,8 +144714,8 @@ aBL aCF aCI aDR -aFJ -aGO +aJi +ayD aIa aJj aKB @@ -146338,7 +144724,7 @@ aNq aOO aQk aRQ -aTo +aTq aUU aWr aNm @@ -146353,8 +144739,8 @@ bfu bly bfq bov -bqu -ckH +aXY +bwm btH aaa abj @@ -146586,10 +144972,10 @@ aCG aDj aEH aFK -aGO +ayD aIb -aJk -aKC +aRX +aEU aMd aNr aOP @@ -146610,7 +144996,7 @@ bfu blz bfq bov -bqu +aXY bsq bsv abj @@ -146843,13 +145229,13 @@ aCH aDQ aEP aFL -aGO +wXI aIc aMe aKD -aMe +aKD aNs -aKE +aJk aQm aRS aTq @@ -146867,8 +145253,8 @@ bjF blA bdU boy -bqu -ckH +aXY +bwm btH aaa abj @@ -147100,15 +145486,15 @@ ayA aDS ayA ayA -aGO -aGO -aMw +ayD +ayD +aFR aKE -aQo -aGO -aGO -aJi -aRT +aFR +ayD +ayD +aFR +aFR aTn ayD bai @@ -147124,8 +145510,8 @@ bbi bbe bbe boz -bqu -ckH +aXY +bwm btH aaa abj @@ -147381,8 +145767,8 @@ bjG blB bbe boy -bqu -ckH +aXY +bwm btH aaa abj @@ -147638,8 +146024,8 @@ bjH blN bbi bov -bqu -ckH +aXY +bwm bsv btH btH @@ -147895,7 +146281,7 @@ bfA bnf bNB cpO -bqu +aXY bsr bsv btI @@ -148152,8 +146538,8 @@ bjI bnh bbi bov -bqu -ckH +aXY +bwm coE bwm bwm @@ -148410,7 +146796,7 @@ blF bbe boB bqz -bst +bva bSi bva bva @@ -148459,7 +146845,7 @@ cKY cMv cNY cPM -cSH +aMb cSH cSH cki @@ -148667,7 +147053,7 @@ bbe bbe boC bqA -bsu +bEq bSV bEq bEq @@ -148716,7 +147102,7 @@ cKY cMw cKV cKV -cKV +aMw cKV cUf cRo @@ -148908,7 +147294,7 @@ aOS aCN aWz azL -aTv +aTw aUZ aWy aBS @@ -148963,23 +147349,23 @@ cxn cxn cxn cxn -cLc -cLc -cHR +cxn +cxn +bng cGF -cHR -cLc -cLc -cMx -cMx -cPO -cPO -cPO -cMx -cMx -cXs +bng +bng +bng cYP -cMx +cYP +cPO +aQj +cPO +cYP +cYP +cYP +cJg +cJg dci ddM dfr @@ -149220,26 +147606,26 @@ cxn cyB cAc cBE -cLc -cEm +cyB +cxn cFd hos cmt bMD cKZ -bVz +cYP cOa -cPP +cPQ cRp cSI cUg -cPO -cXt -cYQ -cPO -cKV -dqW -cSF +aQo +cYP +cYS +cZL +cKO +aRT +cSA cJg dgS cMp @@ -149477,26 +147863,26 @@ cxn cyC cAd cBF -cLc -bDz +cAc +cxn bDD -cGG -cHS -bNO +buF +boG +boG cLa -cMy +cYP cOb cPQ cRq cSJ cUh cVQ -cXu +cYP cYR -cZK -dbf +cZL +cUn dct -cSF +dea cKY dgU diL @@ -149734,26 +148120,26 @@ cxn cyD bBk cAc -cLc -bDA +cyD +cxn bEH -cGH -cHT -bNQ +cGJ +boG +boG cLb -bVI +cYP cOc cPR cRr cSK cUi cVR -cXv +cYP cYS cZL -cKO -dqW -dea +cKV +aRT +cSF cJg dgV diK @@ -149991,23 +148377,23 @@ cxn cxn cAe cxn -cLc -cLc -cLc +cxn +cxn +bng cGI -cLc -cLc -cLc -cMx -cMx -cXw -cRs +cJp +dfK +bng cYP -cMx -cMx -cXw -cYT -cMx +cYP +cYP +cYP +cYP +cYP +cYP +cYP +cJg +cJg daZ dcn ddU @@ -151797,7 +150183,7 @@ cUA cMz cJt cLf -cMC +xKN cOi cMC cSP diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index d72b8a9dfa6..37caea366cd 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -325,6 +325,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -381,9 +384,6 @@ /turf/simulated/floor/plating, /area/shuttle/pod_2) "acw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -431,9 +431,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -509,7 +507,6 @@ /area/security/permabrig) "acO" = ( /obj/machinery/door/poddoor{ - icon_state = "pdoor1"; id_tag = "SecJusticeChamber"; name = "Justice Vent" }, @@ -1055,7 +1052,7 @@ }, /area/security/permabrig) "adU" = ( -/obj/machinery/vending/coffee, +/obj/machinery/vending/coffee/free, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1099,6 +1096,10 @@ }, /area/security/podbay) "aea" = ( +/obj/machinery/camera{ + c_tag = "Prisoner Education Chamber"; + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "warndark" @@ -1238,8 +1239,8 @@ opacity = 0 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredfull" + dir = 9; + icon_state = "warndark" }, /area/security/permabrig) "aey" = ( @@ -1283,8 +1284,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredfull" + dir = 9; + icon_state = "warndark" }, /area/security/permabrig) "aeA" = ( @@ -1454,13 +1455,8 @@ pixel_y = 2 }, /obj/machinery/alarm{ - desc = "This particular atmos control unit appears to have no access restrictions."; dir = 4; - locked = 0; - name = "all-access air alarm"; - pixel_x = -24; - req_access = "0"; - req_one_access = "0" + pixel_x = -22 }, /obj/machinery/door_control{ id = "SecJusticeChamber"; @@ -1484,12 +1480,11 @@ pixel_y = 36; req_access_txt = "1" }, -/obj/machinery/ignition_switch{ +/obj/machinery/flasher_button{ id = "justiceflash"; name = "Justice Flash Control"; pixel_x = -38; - pixel_y = 36; - req_access_txt = "1" + pixel_y = 36 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2105,10 +2100,6 @@ }, /area/security/permabrig) "agr" = ( -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -2121,6 +2112,11 @@ opacity = 0 }, /obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/security/hos) "ags" = ( @@ -2205,9 +2201,13 @@ /turf/simulated/wall/r_wall, /area/security/hos) "agD" = ( -/obj/item/radio/intercom/department/security, -/turf/simulated/wall/r_wall, -/area/security/hos) +/obj/docking_port/stationary/whiteship{ + dir = 8; + id = "whiteship_cerebron"; + name = "North of Cerebron" + }, +/turf/space, +/area/space) "agE" = ( /obj/machinery/light{ dir = 4 @@ -2226,10 +2226,6 @@ /area/security/hos) "agF" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -2241,6 +2237,11 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plating, /area/security/hos) "agG" = ( @@ -2256,10 +2257,6 @@ /area/solar/auxstarboard) "agL" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -2271,6 +2268,11 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/security/hos) "agM" = ( @@ -2455,7 +2457,9 @@ }, /area/security/hos) "ahb" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost") + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2632,10 +2636,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/machinery/atmospherics/pipe/manifold/visible, /obj/item/wrench, /turf/simulated/floor/plasteel{ @@ -2975,14 +2976,15 @@ /area/security/permabrig) "ahT" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/security/permabrig) "ahU" = ( @@ -3038,6 +3040,9 @@ /area/security/hos) "ahZ" = ( /obj/structure/chair/comfy/black, +/obj/effect/landmark/start{ + name = "Head of Security" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3192,6 +3197,7 @@ /obj/item/grenade/barrier, /obj/item/grenade/barrier, /obj/item/grenade/barrier, +/obj/structure/rack, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -3204,9 +3210,7 @@ }, /area/security/armoury) "air" = ( -/turf/simulated/floor/plasteel{ - name = "Holodeck Projector Floor" - }, +/turf/simulated/floor/engine, /area/holodeck/alphadeck) "aiu" = ( /obj/structure/rack, @@ -3258,9 +3262,8 @@ /area/security/permabrig) "aiA" = ( /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 +/obj/item/paper_bin/nanotrasen{ + pixel_y = 8 }, /obj/structure/cable/yellow{ d1 = 4; @@ -3336,17 +3339,15 @@ }, /area/security/permabrig) "aiH" = ( -/obj/machinery/light, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door_control{ + id = "armoryshutter"; + name = "Armory Shutter"; + pixel_x = -7; + pixel_y = 8; + req_access_txt = "3" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/permabrig) +/turf/simulated/wall/r_wall, +/area/security/armoury) "aiI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -3359,6 +3360,7 @@ "aiJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3372,7 +3374,7 @@ "aiL" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/structure/chair/comfy/black{ dir = 4 @@ -3603,7 +3605,6 @@ pixel_x = -26 }, /obj/structure/rack, -/obj/item/storage/fancy, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -3714,7 +3715,6 @@ }, /area/security/permabrig) "ajx" = ( -/obj/machinery/disposal, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -3723,9 +3723,6 @@ pixel_x = -24; pixel_y = -20 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching certain areas."; dir = 1; @@ -3733,6 +3730,10 @@ network = list("Prison","MiniSat","tcomm"); pixel_y = -30 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -4007,9 +4008,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Head of Security" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4255,15 +4253,15 @@ }, /area/security/armoury) "akB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /mob/living/simple_animal/hostile/retaliate/araneus, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/hos) "akC" = ( @@ -4273,9 +4271,6 @@ }, /obj/item/clothing/head/beret/sec, /obj/item/clothing/suit/jacket/pilot, -/obj/machinery/alarm{ - pixel_y = 24 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -4347,7 +4342,9 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "akJ" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost") + }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; @@ -4407,11 +4404,13 @@ pixel_x = -26; pixel_y = 28 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, +/obj/structure/table/reinforced, +/obj/item/radio, +/obj/item/flashlight, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4425,14 +4424,14 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "akQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -4458,15 +4457,15 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet, /area/security/hos) "akT" = ( @@ -4862,15 +4861,15 @@ }, /area/security/main) "alE" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/machinery/light_switch{ name = "light switch "; pixel_y = -22 }, /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4897,18 +4896,35 @@ }, /area/security/main) "alI" = ( -/obj/effect/spawner/window/reinforced, +/obj/machinery/door/airlock/security/glass{ + name = "Security Pods"; + req_access_txt = "71" + }, +/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/security/podbay) "alK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -4969,7 +4985,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ name = "Head of Security's Office"; req_access = null; @@ -4985,6 +5000,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/security/hos) "alS" = ( @@ -5032,6 +5048,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/cart, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -5142,14 +5159,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"amo" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/fore) "amq" = ( /obj/structure/table, /obj/item/restraints/handcuffs, @@ -5290,13 +5299,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -5312,9 +5318,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5355,10 +5358,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5371,47 +5370,32 @@ }, /area/security/main) "amI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Pods"; - req_access_txt = "71" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, +/obj/effect/decal/cleanable/dirt, /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" +/obj/machinery/light/small{ + dir = 1 }, -/area/security/podbay) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore) "amJ" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -5427,21 +5411,18 @@ /turf/simulated/floor/plating, /area/security/warden) "amL" = ( +/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ - d1 = 1; + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/podbay) +/turf/simulated/floor/plating, +/area/security/brig) "amM" = ( /obj/machinery/computer/secure_data, /obj/structure/cable/yellow{ @@ -5464,9 +5445,9 @@ d2 = 8; icon_state = "1-8" }, -/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/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -5502,14 +5483,20 @@ }, /area/security/main) "amV" = ( -/obj/structure/table/reinforced, -/obj/item/spacepod_key{ - id = 100000 +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/security/podbay) +/turf/simulated/floor/plating, +/area/security/brig) "amW" = ( /obj/machinery/light{ dir = 1 @@ -5531,16 +5518,17 @@ name = "\improper Recreation Area" }) "amX" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" }, -/area/security/podbay) +/turf/simulated/floor/plating, +/area/maintenance/fore) "amZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -5783,6 +5771,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "anI" = ( @@ -5915,7 +5907,7 @@ /area/security/main) "anS" = ( /obj/machinery/alarm{ - pixel_y = 28 + pixel_y = 24 }, /obj/structure/table, /obj/machinery/computer/med_data/laptop, @@ -5955,7 +5947,6 @@ }, /area/security/main) "anW" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6000,6 +5991,16 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -6029,6 +6030,10 @@ /area/security/main) "aof" = ( /obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/security/main) "aog" = ( @@ -6060,7 +6065,6 @@ pixel_y = 10 }, /obj/item/pen, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) "aoj" = ( @@ -6106,15 +6110,14 @@ }, /area/security/armoury) "aoo" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aop" = ( @@ -6138,9 +6141,6 @@ c_tag = "Brig - Infirmary"; dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -6156,6 +6156,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitered" @@ -6253,6 +6256,7 @@ /area/maintenance/starboard) "aoH" = ( /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -6289,7 +6293,6 @@ pixel_y = 5 }, /obj/item/stack/packageWrap, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) "aoM" = ( @@ -6315,9 +6318,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "aoT" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 4 - }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -6331,6 +6331,9 @@ layer = 3 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/disposal/deliveryChute{ + dir = 4 + }, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plating, /area/maintenance/disposal) @@ -6476,6 +6479,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -6553,7 +6557,6 @@ }, /area/security/brig) "apr" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6623,7 +6626,6 @@ pixel_y = 5 }, /obj/item/storage/box/donkpockets, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) "apA" = ( @@ -6641,6 +6643,7 @@ }, /area/security/main) "apB" = ( +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6661,6 +6664,7 @@ /obj/effect/landmark/start{ name = "Head of Security" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) "apF" = ( @@ -6890,9 +6894,6 @@ }, /area/engine/gravitygenerator) "aqj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -6904,6 +6905,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -6963,10 +6967,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aqu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -6983,6 +6983,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "aqw" = ( @@ -7001,6 +7004,8 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/item/storage/box/evidence, +/obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -7105,7 +7110,6 @@ /area/security/brig) "aqM" = ( /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -7160,6 +7164,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -7258,7 +7263,10 @@ /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7290,6 +7298,7 @@ "arb" = ( /obj/structure/table/reinforced, /obj/item/paper, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) "arc" = ( @@ -7435,13 +7444,13 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "ars" = ( +/obj/machinery/conveyor/east{ + id = "garbage" + }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/conveyor/east{ - id = "garbage" - }, /turf/simulated/floor/plating, /area/maintenance/disposal) "arw" = ( @@ -7467,13 +7476,13 @@ /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "arD" = ( +/obj/effect/decal/warning_stripes/east, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/structure/disposaloutlet{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/disposal) "arE" = ( @@ -7501,9 +7510,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "arH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -7516,6 +7522,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "arI" = ( @@ -7565,9 +7574,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "arP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -7584,21 +7590,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "arQ" = ( -/obj/structure/table, -/obj/item/storage/box/evidence, -/obj/item/hand_labeler, +/obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" }, /area/security/warden) "arR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7606,6 +7610,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "arS" = ( @@ -7645,10 +7652,6 @@ }, /area/security/warden) "arW" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -7668,7 +7671,6 @@ }, /area/security/brig) "arY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -7732,21 +7734,19 @@ }, /area/security/evidence) "asg" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable{ + d1 = 2; d2 = 8; - icon_state = "0-8" + icon_state = "2-8" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/engine/gravitygenerator) "ash" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -7755,6 +7755,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7788,9 +7791,6 @@ }, /area/security/main) "asm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -7803,14 +7803,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/main) "asn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -7819,6 +7819,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7830,9 +7833,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -7841,6 +7841,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7871,9 +7874,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -7892,12 +7892,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - sortType = 21 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7913,10 +7913,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -7934,6 +7930,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -7949,14 +7948,10 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - sortType = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -8008,10 +8003,6 @@ name = "\improper Recreation Area" }) "asA" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8019,6 +8010,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "asB" = ( @@ -8031,6 +8025,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -8047,6 +8044,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" @@ -8200,10 +8200,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/photocopier, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/vending/security, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -8315,10 +8315,6 @@ name = "Port Maintenance" }) "atl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -8326,13 +8322,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fore) "atm" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -8344,6 +8337,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "ato" = ( @@ -8373,17 +8370,6 @@ icon_state = "showroomfloor" }, /area/security/brig) -"atq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/security/brig) "atr" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -8408,7 +8394,6 @@ }, /area/security/brig) "atv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -8418,6 +8403,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/brig) "atw" = ( @@ -8430,6 +8416,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 = "redcorner" @@ -8451,7 +8438,6 @@ /area/security/main) "atz" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_one_access_txt = "1;4" @@ -8463,29 +8449,24 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/main) -"atA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +"atB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"atB" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/security/main) +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/brig) "atC" = ( /obj/structure/table, -/obj/item/folder/red, -/obj/item/storage/fancy/cigarettes, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel, /area/security/main) "atD" = ( @@ -8501,7 +8482,16 @@ /turf/simulated/floor/plasteel, /area/security/main) "atF" = ( -/turf/simulated/wall/r_wall, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/turf/simulated/floor/plating, /area/maintenance/fore) "atG" = ( /obj/structure/table, @@ -8609,9 +8599,9 @@ name = "\improper Recreation Area" }) "atR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -8793,9 +8783,6 @@ name = "Brig Emergency Storage"; req_access_txt = "63" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -8807,6 +8794,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/brig) "aup" = ( @@ -8860,11 +8850,11 @@ /turf/space, /area/maintenance/auxsolarstarboard) "auw" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light/small{ dir = 8 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -9018,17 +9008,17 @@ }, /area/security/warden) "auP" = ( -/obj/machinery/disposal, /obj/machinery/light_switch{ pixel_y = -26 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/camera{ c_tag = "Fitness Room - Aft"; dir = 1 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -9088,10 +9078,6 @@ }, /area/security/brig) "auV" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -9136,10 +9122,6 @@ /turf/simulated/floor/plasteel, /area/security/brig) "auZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -9147,6 +9129,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 = "redcorner" @@ -9177,7 +9160,9 @@ }, /area/security/brig) "avd" = ( -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost") + }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -9216,9 +9201,6 @@ name = "Security Delivery"; req_access_txt = "1" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9226,6 +9208,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "avh" = ( @@ -9293,10 +9278,6 @@ }, /area/security/main) "avo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -9309,6 +9290,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "avr" = ( @@ -9325,13 +9310,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/processing) "avu" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -9341,6 +9329,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -9351,7 +9343,6 @@ /area/crew_quarters/sleep) "avw" = ( /obj/item/storage/box/evidence, -/obj/structure/disposalpipe/segment, /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 1; @@ -9446,7 +9437,7 @@ "avI" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ @@ -9582,8 +9573,9 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avW" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Supply Bay Bridge Access" +/obj/machinery/door/airlock/maintenance{ + name = "Supply Bay Bridge Access"; + req_access_txt = "12" }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -9600,6 +9592,9 @@ }) "avY" = ( /mob/living/simple_animal/mouse, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -9608,6 +9603,7 @@ /obj/structure/chair{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -9665,7 +9661,6 @@ name = "Brig Maintenance"; req_one_access_txt = "63;12" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -9673,6 +9668,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fore) "awi" = ( @@ -9702,19 +9698,6 @@ icon_state = "dark" }, /area/security/brig) -"awl" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/maintenance/fore) -"awm" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/maintenance/fore) "awn" = ( /obj/structure/cable{ d1 = 1; @@ -9737,8 +9720,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "awp" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall, /area/maintenance/fore) "awq" = ( /obj/structure/cable/yellow{ @@ -9759,9 +9741,6 @@ name = "\improper Recreation Area" }) "awr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -9774,14 +9753,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitered" }, /area/security/brig) "aws" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -9798,16 +9777,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/brig) "awt" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -9819,6 +9797,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/security/brig) "awu" = ( @@ -9834,6 +9816,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -9963,9 +9949,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9973,11 +9956,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "awK" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -10069,7 +10055,7 @@ "awV" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/item/clothing/under/suit_jacket/burgundy, /turf/simulated/floor/carpet, @@ -10089,9 +10075,6 @@ name = "Port Maintenance" }) "awX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -10104,6 +10087,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "awZ" = ( @@ -10112,9 +10098,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10122,6 +10105,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axb" = ( @@ -10149,7 +10135,6 @@ /area/engine/gravitygenerator) "axd" = ( /obj/machinery/door/airlock/engineering{ - icon_state = "door_closed"; name = "Fore Starboard Solar Access"; req_access_txt = "10" }, @@ -10182,6 +10167,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Security Junction"; + sortType = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -10223,7 +10218,6 @@ }, /area/security/warden) "axj" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -10235,6 +10229,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 = 9; icon_state = "red" @@ -10297,16 +10295,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - sortType = 2 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/fore) "axt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -10323,6 +10317,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axu" = ( @@ -10331,10 +10328,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -10342,6 +10335,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axv" = ( @@ -10350,9 +10347,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63" }, @@ -10362,6 +10356,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axw" = ( @@ -10385,15 +10382,15 @@ d2 = 8; icon_state = "2-8" }, -/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/plating, /area/maintenance/fore) "axy" = ( @@ -10402,15 +10399,15 @@ d2 = 8; icon_state = "4-8" }, -/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/plating, /area/maintenance/fore) "axz" = ( @@ -10419,9 +10416,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -10432,6 +10426,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axA" = ( @@ -10459,15 +10456,15 @@ d2 = 4; icon_state = "2-4" }, -/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/plating, /area/maintenance/fore) "axC" = ( @@ -10492,10 +10489,6 @@ }, /area/security/brig) "axH" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10503,6 +10496,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -10529,15 +10525,15 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "axN" = ( -/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 = 4; icon_state = "red" @@ -10598,6 +10594,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -10628,6 +10627,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -10663,9 +10665,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10673,6 +10672,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "aya" = ( @@ -10689,13 +10691,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "ayc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -10801,10 +10803,6 @@ /turf/simulated/floor/plasteel, /area/security/warden) "ayr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -10817,6 +10815,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ays" = ( @@ -10869,13 +10871,23 @@ name = "Gear Room"; req_one_access_txt = "1;4" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/brig) "ayx" = ( @@ -10885,10 +10897,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "ayy" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /turf/simulated/floor/plating/airless, /area/space/nearstation) "ayz" = ( @@ -10930,7 +10939,7 @@ "ayE" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/drone_fabricator, /turf/simulated/floor/plasteel{ @@ -10949,8 +10958,10 @@ /area/maintenance/fore) "ayG" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/security/main) "ayH" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -10961,9 +10972,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "ayI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -10977,6 +10985,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "ayK" = ( @@ -10998,10 +11009,14 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "ayP" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/storage/primary) +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/security/main) "ayQ" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Foyer" @@ -11027,9 +11042,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/brig) "ayT" = ( @@ -11076,10 +11091,6 @@ /obj/machinery/camera{ c_tag = "Warden's Office" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/table, /obj/item/paper_bin{ pixel_x = -4; @@ -11093,7 +11104,12 @@ id = "armoryshutter"; name = "Armory Shutter"; pixel_x = 5; - pixel_y = -3 + pixel_y = -3; + req_access_txt = "3" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -11112,7 +11128,6 @@ }, /area/security/processing) "aza" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -11120,15 +11135,13 @@ }, /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 = "red" }, /area/security/processing) "azc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -11140,6 +11153,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitered" @@ -11217,10 +11233,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "azq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -11238,6 +11250,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "azr" = ( @@ -11247,9 +11263,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "azs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -11264,6 +11277,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "azt" = ( @@ -11310,10 +11326,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "azA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -11335,6 +11347,10 @@ /obj/effect/landmark{ name = "blobstart" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -11441,32 +11457,27 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/effect/decal/warning_stripes/east, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "azL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11474,18 +11485,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "azN" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -11497,15 +11508,15 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "azP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -11517,10 +11528,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plating, @@ -11536,7 +11547,6 @@ name = "Cargo Bay Warehouse Maintenance"; req_one_access_txt = "48;50" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/quartermaster/sorting{ name = "\improper Warehouse" @@ -11552,9 +11562,9 @@ name = "Mining Office"; req_access_txt = "48" }, -/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{ name = "\improper Mining Office" @@ -11563,7 +11573,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; - pixel_x = -25 + pixel_x = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) @@ -11579,7 +11589,6 @@ }, /area/security/brig) "azZ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light/small{ dir = 8 }, @@ -11587,13 +11596,17 @@ dir = 8; pixel_x = -26 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aAa" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -11610,16 +11623,16 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAc" = ( @@ -11628,15 +11641,15 @@ d2 = 8; icon_state = "4-8" }, -/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, /area/security/brig) "aAd" = ( @@ -11645,13 +11658,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAe" = ( @@ -11694,12 +11707,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -11719,9 +11732,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -11736,6 +11746,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAn" = ( @@ -11791,7 +11804,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -11799,6 +11811,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -11894,9 +11907,6 @@ }, /area/crew_quarters/sleep) "aAI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -11919,12 +11929,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aAJ" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/item/clothing/under/assistantformal, /turf/simulated/floor/wood, @@ -11967,6 +11980,16 @@ name = "Holding Cell"; req_access_txt = "2" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -12003,10 +12026,19 @@ name = "Port Maintenance" }) "aAV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/security/main) "aAW" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -12019,6 +12051,10 @@ "aAX" = ( /obj/structure/closet/crate, /obj/item/coin/silver, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -12042,19 +12078,14 @@ name = "Port Maintenance" }) "aBa" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/brig) "aBb" = ( /turf/simulated/wall/r_wall, /area/security/nuke_storage) @@ -12151,10 +12182,10 @@ /area/security/brig) "aBy" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ name = "Recreation Area" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -12258,17 +12289,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aBM" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) +/turf/simulated/floor/plating, +/area/security/main) "aBN" = ( /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" @@ -12352,28 +12377,23 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aBV" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -12381,12 +12401,15 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) "aBX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -12399,14 +12422,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aBY" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -12418,12 +12439,15 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) "aBZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -12439,13 +12463,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aCa" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -12457,6 +12480,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aCb" = ( @@ -12591,7 +12618,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -12611,16 +12637,16 @@ }, /area/security/brig) "aCw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/landmark/start{ + name = "Shaft Miner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/quartermaster/miningdock{ + name = "\improper Mining Office" + }) "aCx" = ( /obj/structure/closet/secure_closet/freezer/money, /obj/item/clothing/head/bearpelt, @@ -12640,7 +12666,7 @@ /area/security/nuke_storage) "aCz" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light{ dir = 1 @@ -12689,10 +12715,7 @@ /area/engine/engineering) "aCE" = ( /obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -12858,10 +12881,6 @@ /turf/simulated/floor/plating, /area/engine/equipmentstorage) "aCN" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -12902,9 +12921,6 @@ /turf/simulated/wall, /area/security/detectives_office) "aCT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -12917,6 +12933,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitered" }, @@ -12932,19 +12951,6 @@ name = "\improper Restrooms" }) "aCV" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -12952,35 +12958,47 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) "aCW" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/sign/chinese{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aCX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/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/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "HoS Junction"; + sortType = 7 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/security/processing) "aCY" = ( /obj/machinery/light/small{ dir = 4 @@ -12998,9 +13016,9 @@ d2 = 2; icon_state = "1-2" }, -/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/plating, /area/maintenance/starboard) "aDa" = ( @@ -13008,7 +13026,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aDb" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/highsecurity{ name = "Gravity Generator Foyer"; req_access_txt = "10" @@ -13016,22 +13033,39 @@ /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/gravitygenerator) "aDc" = ( -/obj/structure/disposalpipe/segment, /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) "aDd" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) "aDe" = ( /obj/structure/closet, /obj/item/poster/random_contraband, @@ -13156,10 +13190,6 @@ pixel_x = -3; pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -13167,9 +13197,6 @@ name = "\improper Warehouse" }) "aDA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_y = 28 }, @@ -13180,9 +13207,6 @@ name = "\improper Warehouse" }) "aDB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; @@ -13527,19 +13551,18 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "aEf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/fore) "aEg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/fore) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/security/brig) "aEh" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -13595,9 +13618,9 @@ }, /area/engine/engineering) "aEo" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ dir = 4; - icon_state = "pipe-c" + icon_state = "pipe-y" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13615,16 +13638,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aEq" = ( @@ -13633,15 +13655,15 @@ d2 = 8; icon_state = "4-8" }, -/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 = "neutralcorner" }, @@ -13655,15 +13677,15 @@ d2 = 8; icon_state = "4-8" }, -/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/plating, /area/maintenance/starboard) "aEs" = ( @@ -13674,11 +13696,6 @@ name = "\improper Mining Office" }) "aEt" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -13690,34 +13707,20 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) -"aEu" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/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/plating, -/area/maintenance/starboard) "aEv" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -13728,13 +13731,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEw" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -13751,6 +13753,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEx" = ( @@ -13825,9 +13831,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13835,13 +13838,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"aEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"aEE" = ( /obj/effect/decal/warning_stripes/west, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aEH" = ( @@ -13866,8 +13872,10 @@ /area/space) "aEJ" = ( /obj/machinery/door/airlock/external{ + id_tag = "mining_home"; locked = 1; - name = "Mining Dock Airlock" + name = "Mining Dock Airlock"; + req_access_txt = "48" }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -13881,6 +13889,7 @@ }) "aEL" = ( /obj/machinery/door/airlock/mining/glass{ + id_tag = "mining_home"; locked = 1; name = "Mining Dock"; req_access_txt = "48" @@ -13907,10 +13916,10 @@ /obj/effect/landmark/start{ name = "Shaft Miner" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -13982,12 +13991,12 @@ name = "Port Maintenance" }) "aEV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -14236,12 +14245,12 @@ }, /area/security/brig) "aFB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -14388,12 +14397,7 @@ name = "\improper Mining Office" }) "aFP" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -14401,10 +14405,15 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/engine/chiefs_office) "aFQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door_control{ id = "qm_mine_warehouse"; name = "Warehouse Door Control"; @@ -14483,7 +14492,7 @@ "aGc" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -14500,8 +14509,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start{ + name = "Shaft Miner" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -14525,7 +14537,6 @@ name = "\improper Mining Office" }) "aGi" = ( -/obj/structure/disposalpipe/segment, /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -14690,15 +14701,16 @@ }, /area/security/brig) "aGy" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable/yellow{ + d1 = 2; d2 = 4; - icon_state = "0-4" + icon_state = "2-4" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" @@ -14735,9 +14747,9 @@ }, /area/security/brig) "aGC" = ( -/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/engine/engineering) "aGD" = ( @@ -14787,11 +14799,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -14828,25 +14840,24 @@ }, /area/crew_quarters/sleep) "aGN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/effect/spawner/lootdrop{ + loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); + name = "maint grille or trash spawner" }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aGO" = ( /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aGP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/structure/chair/stool{ pixel_y = 8 @@ -14854,10 +14865,7 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aGQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -14884,7 +14892,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aGU" = ( -/obj/machinery/door/airlock/tranquillite, +/obj/machinery/door/airlock/tranquillite{ + name = "Mime's Office"; + req_access_txt = "46" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -14944,12 +14955,16 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aHb" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, -/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" @@ -14978,7 +14993,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/chair{ dir = 8 @@ -14993,15 +15008,16 @@ /turf/simulated/floor/plating, /area/engine/engineering) "aHj" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, /obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" @@ -15057,9 +15073,6 @@ name = "\improper Mining Office" }) "aHs" = ( -/obj/effect/landmark/start{ - name = "Shaft Miner" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15068,11 +15081,11 @@ name = "\improper Mining Office" }) "aHt" = ( -/obj/structure/closet/secure_closet/miner, /obj/machinery/alarm{ dir = 8; pixel_x = 24 }, +/obj/structure/closet/secure_closet/miner, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -15081,7 +15094,6 @@ name = "\improper Mining Office" }) "aHu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -15095,6 +15107,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -15144,7 +15160,6 @@ }) "aHB" = ( /obj/machinery/door/airlock/vault{ - icon_state = "door_locked"; locked = 1; req_access_txt = "53" }, @@ -15259,12 +15274,16 @@ }, /area/hallway/primary/fore) "aHR" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, -/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" @@ -15388,11 +15407,8 @@ name = "Port Maintenance" }) "aHY" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -15486,10 +15502,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "aIi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -15497,6 +15509,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIk" = ( @@ -15517,13 +15533,12 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aIm" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/chair/office/light, /obj/effect/landmark/start{ @@ -15737,12 +15752,10 @@ }, /area/security/detectives_office) "aIH" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, -/obj/structure/cable/yellow, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -15750,6 +15763,12 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) "aIJ" = ( @@ -15787,9 +15806,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start{ + name = "Shaft Miner" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -15870,19 +15892,21 @@ name = "Storage Wing" }) "aIZ" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/construction/Storage{ name = "Storage Wing" @@ -15890,7 +15914,7 @@ "aJa" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) @@ -16143,7 +16167,6 @@ name = "Brig Control"; req_access_txt = "3" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -16159,6 +16182,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/warden) "aJz" = ( @@ -16242,7 +16266,6 @@ }, /area/crew_quarters/sleep) "aJD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -16258,19 +16281,19 @@ /obj/structure/chair/stool{ pixel_y = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aJI" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -16281,7 +16304,10 @@ /turf/simulated/floor/engine, /area/engine/engineering) "aJK" = ( -/obj/machinery/door/airlock/bananium/glass, +/obj/machinery/door/airlock/bananium{ + name = "Clown's Office"; + req_access_txt = "46" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -16342,7 +16368,6 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aJS" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -16437,9 +16462,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start{ + name = "Shaft Miner" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -16478,7 +16506,6 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -16941,12 +16968,15 @@ }, /area/crew_quarters/sleep) "aLe" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aLf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -16955,7 +16985,10 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -16986,7 +17019,7 @@ /area/crew_quarters/sleep) "aLj" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -17024,7 +17057,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17211,6 +17243,11 @@ /area/construction) "aLK" = ( /obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "qmshutter"; + name = "Quartermaster's privacy shutter" + }, /turf/simulated/floor/plating, /area/quartermaster/qm) "aLL" = ( @@ -17249,13 +17286,11 @@ /turf/simulated/floor/engine, /area/engine/engineering) "aLP" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -17264,7 +17299,6 @@ /obj/machinery/firealarm{ pixel_y = 27 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aLR" = ( @@ -17274,7 +17308,6 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aLS" = ( -/obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -17282,7 +17315,6 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aLU" = ( @@ -17351,18 +17383,14 @@ name = "\improper Mining Office" }) "aMc" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/mouse, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/mob/living/simple_animal/mouse, /turf/simulated/floor/plating, /area/maintenance/fore) "aMd" = ( @@ -17429,7 +17457,6 @@ /turf/simulated/wall, /area/lawoffice) "aMo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "Brig"; @@ -17443,6 +17470,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 = "redfull" }, @@ -17571,11 +17599,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aMD" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j2s"; - sortType = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -17586,12 +17609,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fore) "aME" = ( @@ -17625,7 +17649,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17673,12 +17696,13 @@ /turf/simulated/floor/plasteel, /area/construction) "aMP" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ + d1 = 1; d2 = 4; - icon_state = "0-4" + icon_state = "1-4" }, /obj/structure/cable/yellow, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "aMQ" = ( @@ -17707,11 +17731,14 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMT" = ( @@ -17731,6 +17758,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMU" = ( @@ -17751,20 +17781,19 @@ d2 = 8; icon_state = "4-8" }, -/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, /area/quartermaster/storage) "aMX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -17777,6 +17806,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "aMY" = ( @@ -17793,13 +17823,15 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/effect/decal/warning_stripes/northeastcorner, /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, /area/quartermaster/storage) "aMZ" = ( @@ -17808,11 +17840,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17841,13 +17868,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNc" = ( @@ -17856,10 +17881,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18028,28 +18049,42 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc{ + name = "Port Maintenance APC"; + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "aNn" = ( /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fore) +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aNo" = ( /turf/simulated/wall, /area/security/processing) "aNp" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ + d1 = 1; d2 = 8; - icon_state = "0-8" + icon_state = "1-8" }, /obj/structure/cable/yellow, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "aNq" = ( @@ -18294,7 +18329,7 @@ /turf/simulated/floor/plating, /area/storage/secure) "aNV" = ( -/obj/machinery/shieldgen, +/obj/machinery/suit_storage_unit/engine/secure, /turf/simulated/floor/plating, /area/storage/secure) "aNX" = ( @@ -18319,10 +18354,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18363,10 +18394,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -18434,7 +18461,7 @@ "aOk" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel, /area/construction) @@ -18447,7 +18474,7 @@ /area/construction) "aOp" = ( /obj/machinery/door/poddoor{ - id_tag = "QMLoaddoor"; + id_tag = "QMLoaddoor2"; name = "supply dock loading door" }, /obj/machinery/conveyor/east{ @@ -18486,24 +18513,17 @@ name = "\improper Restrooms" }) "aOx" = ( -/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_one_access_txt = "48;50" - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/construction/Storage{ - name = "Storage Wing" +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" }) "aOy" = ( /obj/structure/cable/yellow{ @@ -18641,10 +18661,21 @@ /turf/simulated/floor/wood, /area/lawoffice) "aOW" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Disposals Junction"; + sortType = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aOX" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -18653,12 +18684,12 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aOY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -18688,7 +18719,6 @@ /turf/simulated/floor/engine, /area/engine/engineering) "aPb" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -18696,6 +18726,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 = "neutralcorner" }, @@ -18749,17 +18780,14 @@ }) "aPk" = ( /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/wirecutters, /obj/item/weldingtool, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) "aPl" = ( -/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/storage/secure) "aPm" = ( @@ -18788,9 +18816,9 @@ d2 = 2; icon_state = "1-2" }, -/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/engine/engineering) "aPq" = ( @@ -18870,7 +18898,6 @@ pixel_y = 24; req_access_txt = "50" }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aPx" = ( @@ -19000,7 +19027,7 @@ "aPI" = ( /obj/machinery/seed_extractor, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -19033,9 +19060,6 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 8 }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aPN" = ( @@ -19222,7 +19246,7 @@ /area/turret_protected/ai_upload) "aQk" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -19231,7 +19255,7 @@ "aQp" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -19352,9 +19376,6 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 8 }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aQH" = ( @@ -19391,15 +19412,20 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aQK" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -19408,6 +19434,10 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -19488,6 +19518,7 @@ /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/simulated/floor/plating, /area/storage/secure) "aQU" = ( @@ -19496,22 +19527,19 @@ /area/engine/engineering) "aQV" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/locker) +/area/crew_quarters/sleep) "aQW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/locker) +/area/crew_quarters/sleep) "aQX" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -19873,13 +19901,11 @@ }, /area/security/brig) "aRQ" = ( +/mob/living/simple_animal/mouse, +/obj/machinery/atmospherics/binary/valve, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, -/mob/living/simple_animal/mouse, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -19917,15 +19943,16 @@ }, /area/crew_quarters/courtroom) "aRV" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" + dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) +/turf/simulated/floor/plasteel, +/area/storage/primary) "aRW" = ( /obj/structure/table/wood, /obj/item/book/manual/security_space_law, @@ -19941,10 +19968,6 @@ /turf/simulated/floor/wood, /area/lawoffice) "aRX" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -19954,18 +19977,14 @@ codes_txt = "patrol;next_patrol=14.5-Recreation"; location = "14.3-Lockers-Dorms" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aRZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -20117,7 +20136,6 @@ /obj/effect/landmark/start{ name = "Cargo Technician" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aSA" = ( @@ -20162,7 +20180,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -20170,6 +20187,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/engineering) "aSF" = ( @@ -20205,6 +20223,13 @@ /area/crew_quarters/sleep) "aSI" = ( /obj/structure/closet/secure_closet/quartermaster, +/obj/machinery/door_control{ + id = "qmshutter"; + name = "Privacy Shutters Control"; + pixel_x = -6; + pixel_y = 24; + req_access_txt = "41" + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -20237,10 +20262,10 @@ name = "\improper Restrooms" }) "aSK" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, +/obj/structure/filingcabinet/chestdrawer, /obj/machinery/light{ dir = 1 }, @@ -20535,10 +20560,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) @@ -20548,22 +20569,20 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -20576,12 +20595,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock{ name = "Garden" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -20623,10 +20642,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -20637,10 +20656,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -20659,11 +20678,11 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/disposal, /obj/machinery/camera{ c_tag = "Garden"; dir = 8 }, +/obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -20685,6 +20704,9 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disaster_counter/supermatter{ + pixel_x = 32 + }, /turf/simulated/floor/engine, /area/engine/engineering) "aTK" = ( @@ -20699,8 +20721,8 @@ /turf/simulated/floor/engine, /area/engine/supermatter) "aTL" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aTP" = ( @@ -20756,9 +20778,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -20770,6 +20789,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "qmshutter"; + name = "Quartermaster's privacy shutter" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aTX" = ( @@ -20778,24 +20805,21 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/quartermaster/qm) "aTY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -20804,22 +20828,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aTZ" = ( /obj/effect/landmark/start{ name = "Quartermaster" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/chair/office/dark{ 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, /area/quartermaster/qm) "aUa" = ( @@ -20841,10 +20868,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/west, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -20854,18 +20881,15 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 8 }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aUe" = ( +/obj/machinery/alarm{ + pixel_y = 24 + }, /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/alarm{ - pixel_y = 23 - }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 5; @@ -21065,6 +21089,9 @@ /area/quartermaster/storage) "aUu" = ( /obj/item/storage/toolbox/emergency, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -21231,7 +21258,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -21239,6 +21265,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/engineering) "aUT" = ( @@ -21295,17 +21322,15 @@ /turf/simulated/floor/plasteel, /area/construction) "aVa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/warning_stripes/north, /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, /area/quartermaster/storage) "aVb" = ( @@ -21334,16 +21359,15 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northeast, /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, /area/quartermaster/storage) "aVe" = ( @@ -21437,8 +21461,6 @@ name = "Port Maintenance" }) "aVr" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/camera{ c_tag = "Locker Room Starboard" }, @@ -21446,6 +21468,10 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -21482,16 +21508,16 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aVv" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/table, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /obj/machinery/camera{ c_tag = "Cargo Bay - Starboard"; dir = 8 @@ -21500,7 +21526,6 @@ pixel_x = -1; pixel_y = 6 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aVw" = ( @@ -21617,9 +21642,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -21885,10 +21907,7 @@ pixel_y = -26 }, /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen/multi, /turf/simulated/floor/wood, /area/lawoffice) @@ -21900,16 +21919,15 @@ /turf/simulated/floor/wood, /area/lawoffice) "aWm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aWn" = ( @@ -22014,15 +22032,15 @@ name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -22121,7 +22139,6 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aWM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 4 }, @@ -22144,6 +22161,9 @@ /area/engine/engineering) "aWO" = ( /obj/machinery/computer/supplycomp, +/obj/machinery/light_switch{ + pixel_x = -23 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -22189,10 +22209,7 @@ }, /area/quartermaster/qm) "aWS" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -22201,26 +22218,33 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aWT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aWU" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aWV" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, /area/storage/primary) +"aWU" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) +"aWV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "aWW" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -22334,7 +22358,6 @@ /obj/item/folder/yellow, /obj/item/paper, /obj/item/paper, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aXo" = ( @@ -22378,9 +22401,6 @@ /area/engine/engineering) "aXt" = ( /obj/machinery/computer/security/mining, -/obj/machinery/light_switch{ - pixel_x = -23 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -22434,23 +22454,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXz" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/turf/simulated/wall, +/area/quartermaster/office) "aXB" = ( /obj/structure/table, /obj/item/clipboard, @@ -22665,7 +22675,6 @@ pixel_x = -27 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; layer = 4.1 }, /turf/simulated/floor/plasteel{ @@ -22681,10 +22690,7 @@ name = "Arrivals" }) "aYb" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -22696,9 +22702,9 @@ name = "Arrivals" }) "aYh" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aYi" = ( @@ -22706,10 +22712,7 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aYj" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/machinery/light{ dir = 8 }, @@ -22720,14 +22723,15 @@ }, /area/storage/primary) "aYk" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-c" + sortType = 2 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aYl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -22745,11 +22749,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_y = 30 - }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 5; @@ -22774,6 +22773,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -22789,6 +22791,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -22803,7 +22808,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aYs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -22811,17 +22815,18 @@ }, /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, /area/storage/primary) "aYt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/storage/primary) +/turf/simulated/wall, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aYv" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -22852,7 +22857,6 @@ /area/hallway/primary/central) "aYy" = ( /obj/machinery/door/airlock/highsecurity{ - icon_state = "door_closed"; name = "AI Upload"; req_access_txt = "16" }, @@ -22988,6 +22992,10 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYO" = ( @@ -23029,9 +23037,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aYS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -23040,6 +23045,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYT" = ( @@ -23112,15 +23120,15 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "aYY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -23129,6 +23137,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) "aYZ" = ( @@ -23151,11 +23160,11 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "aZb" = ( @@ -23164,10 +23173,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -23179,6 +23184,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/security/brig) "aZc" = ( @@ -23187,9 +23196,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ - sortType = 5 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -23201,6 +23207,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + name = "CE's Junction"; + sortType = 5 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aZd" = ( @@ -23321,12 +23331,11 @@ /area/quartermaster/storage) "aZw" = ( /obj/structure/disposalpipe/segment{ - dir = 8; + dir = 4; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/hallway/primary/port) "aZx" = ( /obj/machinery/flasher{ id = "AI"; @@ -23341,6 +23350,9 @@ /area/turret_protected/ai_upload) "aZy" = ( /obj/item/flag/cargo, +/obj/machinery/status_display/supply_display{ + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -23373,12 +23385,12 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aZC" = ( -/obj/structure/table, -/obj/item/storage/belt/utility, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, +/obj/structure/table, +/obj/item/storage/belt/utility, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -23391,19 +23403,18 @@ }, /area/storage/primary) "aZE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/storage/primary) "aZF" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -23700,22 +23711,22 @@ dir = 1; pixel_y = 2 }, -/obj/machinery/disposal/deliveryChute{ - dir = 4; - name = "Crate Disposal Chute"; - pixel_x = -5; - pixel_y = 2 - }, /obj/machinery/door/window/westleft{ base_state = "right"; dir = 4; icon_state = "right"; name = "Crate Disposal Chute" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/disposal/deliveryChute{ + dir = 4; + name = "Crate Disposal Chute"; + pixel_x = -5; + pixel_y = 2 + }, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -23753,9 +23764,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -23767,16 +23775,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "bas" = ( /obj/structure/closet/crate, -/obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bau" = ( @@ -23791,7 +23804,6 @@ /turf/simulated/floor/plasteel, /area/construction) "baw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -23809,6 +23821,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "bay" = ( @@ -23841,7 +23854,6 @@ dir = 4; pixel_x = 24 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "baD" = ( @@ -23868,14 +23880,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/status_display{ + pixel_x = 32 + }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "baG" = ( @@ -23987,7 +23998,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "baU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -23996,6 +24006,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /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{ dir = 8 @@ -24089,17 +24100,14 @@ "bbf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "32;19;70" + name = "Engineering"; + req_access_txt = "32" }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -24110,6 +24118,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bbg" = ( @@ -24162,7 +24173,7 @@ /area/turret_protected/ai_upload_foyer) "bbm" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; @@ -24569,7 +24580,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -24682,7 +24692,7 @@ network = list("SS13","RD","AIUpload") }, /obj/machinery/alarm{ - pixel_y = 26 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -24704,7 +24714,6 @@ /area/engine/engineering) "bcs" = ( /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -24720,12 +24729,12 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcy" = ( @@ -24746,6 +24755,10 @@ /area/quartermaster/office) "bcA" = ( /obj/machinery/vending/cigarette, +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -24791,7 +24804,7 @@ }, /obj/item/trash/popcorn, /obj/structure/disposalpipe/segment{ - dir = 4; + dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plating, @@ -24804,9 +24817,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, @@ -24820,9 +24830,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -24834,10 +24841,6 @@ d2 = 8; icon_state = "2-8" }, -/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{ @@ -24846,11 +24849,15 @@ }, /area/hallway/primary/central) "bcK" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bcL" = ( /obj/machinery/firealarm{ @@ -24942,6 +24949,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" @@ -24989,20 +24999,6 @@ }, /turf/space, /area/space/nearstation) -"bdq" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bdr" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -25177,7 +25173,6 @@ /area/quartermaster/storage) "bdD" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -25190,6 +25185,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/chiefs_office) "bdE" = ( @@ -25338,7 +25334,7 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdT" = ( -/obj/machinery/status_display, +/obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/storage) "bdU" = ( @@ -25399,8 +25395,8 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "beb" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bec" = ( @@ -25427,7 +25423,7 @@ /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/effect/decal/warning_stripes/southeast, +/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bef" = ( @@ -25436,10 +25432,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "beg" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -25455,9 +25451,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -25467,22 +25460,11 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bej" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bek" = ( /obj/structure/cable/yellow{ @@ -25653,7 +25635,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -25665,6 +25646,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bey" = ( @@ -25819,8 +25801,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -25883,15 +25865,15 @@ d2 = 8; icon_state = "4-8" }, -/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, /area/security/brig) "beW" = ( @@ -26047,9 +26029,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -26057,10 +26036,12 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "bfn" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -26075,17 +26056,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"bfp" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "bfq" = ( /obj/machinery/camera{ c_tag = "Cargo Bay - Aft"; @@ -26133,8 +26105,8 @@ }) "bfv" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southeast, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfw" = ( @@ -26198,9 +26170,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -26208,6 +26177,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "bfG" = ( @@ -26230,9 +26202,9 @@ d2 = 2; icon_state = "1-2" }, -/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) "bfJ" = ( @@ -26253,14 +26225,11 @@ }, /area/hallway/primary/central) "bfM" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) +/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) "bfN" = ( /obj/structure/cable{ d1 = 2; @@ -26272,24 +26241,7 @@ "bfO" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bfQ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -26352,7 +26304,7 @@ "bfZ" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -26667,7 +26619,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgA" = ( @@ -26694,10 +26645,7 @@ }) "bgC" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/telepad, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/telepad_cargo, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgF" = ( @@ -26721,10 +26669,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -26732,6 +26676,10 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/security/brig) "bgK" = ( @@ -26745,9 +26693,6 @@ icon_state = "1-8" }, /obj/effect/decal/warning_stripes/southwest, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgL" = ( @@ -26874,10 +26819,6 @@ pixel_y = -2 }, /obj/effect/decal/warning_stripes/south, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -26924,9 +26865,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) @@ -26938,9 +26876,22 @@ name = "Arrivals" }) "bhc" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall, -/area/quartermaster/office) +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/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, +/area/hallway/primary/central) "bhd" = ( /obj/structure/table, /obj/item/flashlight{ @@ -26976,7 +26927,6 @@ }, /area/quartermaster/office) "bhf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 4; name = "CE Office APC"; @@ -26995,6 +26945,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -27039,10 +26990,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bhm" = ( -/obj/structure/disposalpipe/segment, /obj/effect/landmark{ name = "lightsout" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bhn" = ( @@ -27094,6 +27045,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/janitor) "bht" = ( @@ -27103,7 +27055,6 @@ /obj/machinery/door/airlock{ name = "Central Emergency Storage" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -27112,13 +27063,10 @@ /turf/simulated/floor/plating, /area/maintenance/maintcentral) "bhv" = ( +/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -27222,6 +27170,10 @@ /obj/structure/reagent_dispensers/spacecleanertank{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/janitor) "bhL" = ( @@ -27310,7 +27262,6 @@ name = "Arrivals" }) "bhX" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; @@ -27437,7 +27388,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -27450,6 +27400,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "bil" = ( @@ -27532,7 +27483,9 @@ name = "Station Intercom (General)"; pixel_y = 20 }, -/obj/machinery/computer/security, +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost","Telecomms") + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -27599,17 +27552,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/quartermaster/office) "biE" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/conveyor{ dir = 4; id = "packageSort2" }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /obj/structure/disposaloutlet{ dir = 4 }, @@ -27669,29 +27621,24 @@ }, /area/atmos) "biK" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"biL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) -"biM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; + dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) +"biL" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"biM" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet, +/area/crew_quarters/theatre) "biN" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/plasteel{ @@ -27754,28 +27701,18 @@ }, /area/hallway/primary/central) "biW" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/chair/stool/bar, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "bar" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - sortType = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) +/area/crew_quarters/bar) "biX" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -27793,6 +27730,10 @@ "biZ" = ( /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/plasteel{ icon_state = "floorgrime" }, @@ -27800,7 +27741,10 @@ "bja" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/alarm{ - pixel_y = 28 + pixel_y = 24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -27879,7 +27823,7 @@ }, /area/quartermaster/office) "bjg" = ( -/obj/machinery/status_display{ +/obj/machinery/status_display/supply_display{ pixel_y = 32 }, /obj/structure/table, @@ -27902,11 +27846,11 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -27954,18 +27898,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bjn" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bjp" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -28086,9 +28018,6 @@ /area/storage/tech) "bjA" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -28163,7 +28092,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/computer/security/telescreen{ desc = "A telescreen that connects to the engine's camera network."; dir = 8; @@ -28173,6 +28101,7 @@ pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -28187,16 +28116,16 @@ }, /area/engine/chiefs_office) "bjI" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /obj/structure/closet/secure_closet/engineering_chief, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -28554,8 +28483,6 @@ name = "Mailroom Maintenance"; req_access_txt = "50" }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/quartermaster/office) "bkv" = ( @@ -28570,7 +28497,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bkw" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -28579,10 +28505,10 @@ /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) "bkx" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -28602,7 +28528,7 @@ "bkz" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -28630,9 +28556,20 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "bkC" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/quartermaster/office) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) "bkD" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -28674,7 +28611,7 @@ }, /area/hallway/primary/central) "bkK" = ( -/obj/machinery/status_display{ +/obj/machinery/status_display/supply_display{ pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -28705,10 +28642,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -28718,9 +28652,6 @@ name = "Custodial Maintenance"; req_access_txt = "26" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28729,9 +28660,6 @@ /turf/simulated/floor/plating, /area/janitor) "bkP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28744,10 +28672,6 @@ pixel_x = 1; pixel_y = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -28798,15 +28722,13 @@ name = "\improper Warehouse" }) "bkY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/binary/valve{ - name = "output gas to space" - }, +/obj/machinery/atmospherics/binary/valve, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -28816,6 +28738,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/simple/insulated, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -28837,8 +28760,8 @@ name = "\improper Captain's Quarters" }) "blc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -28863,16 +28786,6 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"blf" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "blg" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -28961,7 +28874,6 @@ /turf/simulated/floor/plating, /area/maintenance/incinerator) "blt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -28970,13 +28882,16 @@ /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/engine/engineering) "blx" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/quartermaster/office) +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria" + }, +/area/crew_quarters/kitchen) "bly" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -29237,7 +29152,7 @@ "blX" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/structure/closet, /obj/item/crowbar, @@ -29320,38 +29235,57 @@ name = "Customs" }) "bmd" = ( +/obj/effect/decal/warning_stripes/east, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal/deliveryChute{ dir = 8 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/quartermaster/office) "bme" = ( -/obj/machinery/space_heater, -/obj/structure/disposalpipe/wrapsortjunction{ - dir = 1 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "Kitchen Junction"; + sortType = 20 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "bmf" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 }, -/turf/simulated/wall, -/area/quartermaster/office) +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/bridge) "bmg" = ( -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -29359,10 +29293,15 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plating, /area/quartermaster/office) "bmh" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Engine Room"; @@ -29376,6 +29315,7 @@ /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/engine/engineering) "bmi" = ( @@ -29503,7 +29443,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "bms" = ( -/obj/structure/disposalpipe/segment, /obj/effect/landmark/start{ name = "Cargo Technician" }, @@ -29521,10 +29460,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "bmt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -29534,6 +29469,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -29551,9 +29490,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bmv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -29565,15 +29501,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/hallway/primary/port) "bmw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -29582,6 +29518,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmy" = ( @@ -29590,12 +29529,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmz" = ( @@ -29652,10 +29591,6 @@ }, /area/janitor) "bmE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -29667,6 +29602,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -29762,15 +29701,19 @@ }, /area/engine/chiefs_office) "bmO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "kitchenwindow"; + name = "kitchen shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, -/area/maintenance/maintcentral) +/area/crew_quarters/kitchen) "bmP" = ( /obj/machinery/light_switch{ pixel_x = 27 @@ -29896,24 +29839,17 @@ codes_txt = "patrol;next_patrol=14.2-Central-CrewQuarters"; location = "14-Starboard-Central" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - 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, /area/hallway/primary/central) "bnc" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" - }, -/area/hallway/primary/central) +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "bnd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -29975,28 +29911,27 @@ }, /area/hallway/primary/starboard) "bnl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) +"bnm" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" + dir = 8; + icon_state = "neutralcorner" }, -/area/hallway/primary/starboard) -"bnm" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/starboard) +/area/hallway/primary/central) "bnn" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light{ dir = 1 @@ -30016,10 +29951,6 @@ }, /area/hallway/primary/starboard) "bnq" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -30050,7 +29981,7 @@ "bnu" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/light, /obj/machinery/camera{ @@ -30108,14 +30039,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -30233,14 +30164,14 @@ }, /area/maintenance/starboard) "bnM" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -28 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -30416,11 +30347,25 @@ name = "Port Maintenance" }) "boe" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/bridge) "bof" = ( /obj/machinery/door/poddoor{ density = 0; @@ -30429,7 +30374,6 @@ name = "Engineering Security Doors"; opacity = 0 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -30438,6 +30382,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) "bog" = ( @@ -30521,12 +30466,15 @@ }, /area/bridge) "bos" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bot" = ( @@ -30747,37 +30695,17 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"boP" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/junction{ - dir = 4; + dir = 2; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "boQ" = ( /obj/structure/cable/yellow{ @@ -30789,34 +30717,15 @@ /obj/machinery/door/airlock/public/glass{ name = "Starboard Primary Hallway" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"boR" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30827,9 +30736,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -30841,6 +30747,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30851,9 +30760,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -30865,26 +30771,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"boW" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30895,15 +30784,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30914,16 +30804,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - 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 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30934,9 +30823,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30944,6 +30830,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -30954,9 +30843,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -30968,15 +30854,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bpf" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -30988,6 +30873,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -31022,22 +30911,11 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bpj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/obj/structure/closet/emcloset, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bpk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -31050,6 +30928,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) "bpm" = ( @@ -31235,6 +31114,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -31341,14 +31221,14 @@ }, /area/quartermaster/office) "bpP" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /obj/item/storage/box, /obj/structure/table, /obj/item/storage/box, /obj/item/storage/box, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ dir = 6; @@ -31362,11 +31242,11 @@ }, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -31383,7 +31263,6 @@ }, /area/quartermaster/office) "bpT" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -31415,15 +31294,12 @@ }, /area/hallway/primary/port) "bpX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "browncorner" }, @@ -31611,9 +31487,9 @@ name = "\improper Captain's Quarters" }) "bqq" = ( -/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/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -31629,7 +31505,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ @@ -31645,9 +31521,9 @@ codes_txt = "patrol;next_patrol=13.1-Engineering-Enter"; location = "12-Central-Starboard" }, -/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) "bqv" = ( @@ -31772,9 +31648,9 @@ d2 = 2; icon_state = "1-2" }, -/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" }, @@ -31794,19 +31670,28 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bqQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "bqR" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "bqS" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -31844,9 +31729,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bqW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; @@ -31864,6 +31746,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "bqX" = ( @@ -32218,13 +32103,13 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -32295,13 +32180,13 @@ }, /area/hallway/primary/port) "brM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -32327,11 +32212,16 @@ dir = 8; pixel_x = 24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "brP" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /obj/item/paper_bin{ pixel_x = -4; pixel_y = 10 @@ -32340,10 +32230,6 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ dir = 1; @@ -32395,18 +32281,13 @@ }, /area/hallway/primary/port) "brW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/turbine_computer{ - id = "incineratorturbine" - }, /obj/machinery/atmospherics/pipe/simple/insulated, +/obj/machinery/meter, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/incinerator) "brX" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ dir = 8; @@ -32543,9 +32424,9 @@ req_access = null; req_access_txt = "20" }, -/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/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -32603,29 +32484,26 @@ req_access_txt = "12" }, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "bss" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/light_switch{ pixel_x = 27 }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, /area/quartermaster/office) "bsv" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -32638,6 +32516,10 @@ }, /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/plasteel{ icon_state = "neutralcorner" }, @@ -32651,6 +32533,7 @@ /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; + name = "Atmospherics Junction"; sortType = 6 }, /turf/simulated/floor/plasteel{ @@ -32664,10 +32547,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsz" = ( @@ -32705,13 +32588,16 @@ /turf/simulated/floor/plating, /area/janitor) "bsF" = ( -/obj/structure/disposalpipe/sortjunction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + name = "Engineering Junction"; + sortType = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bsG" = ( @@ -32735,7 +32621,6 @@ dir = 1; pixel_y = 2 }, -/obj/structure/disposalpipe/segment, /obj/item/bikehorn/rubberducky, /obj/machinery/light_switch{ pixel_x = -28 @@ -32743,6 +32628,7 @@ /obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -32982,7 +32868,6 @@ pixel_x = -25 }, /obj/machinery/door/airlock/highsecurity{ - icon_state = "door_locked"; locked = 1; name = "AI Chamber"; req_access_txt = "16" @@ -33046,8 +32931,8 @@ name = "Privacy Shutters"; opacity = 0 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/blueshield) "btm" = ( @@ -33103,11 +32988,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -33174,12 +33059,14 @@ }, /area/hallway/primary/port) "btC" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/area/hallway/primary/port) +/turf/simulated/floor/plasteel{ + icon_state = "greencorner" + }, +/area/hallway/primary/central) "btD" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -33203,12 +33090,12 @@ }, /area/hallway/primary/port) "btG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -33234,7 +33121,6 @@ codes_txt = "patrol;next_patrol=4-Customs"; location = "3-Central-Port" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -33320,10 +33206,6 @@ }, /area/quartermaster/office) "btS" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -33475,7 +33357,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -33531,13 +33413,13 @@ name = "\improper Captain's Quarters" }) "bug" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -33776,10 +33658,6 @@ }, /area/bridge) "buF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -33796,24 +33674,21 @@ }, /area/hallway/primary/starboard) "buG" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - 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, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) "buH" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "buI" = ( @@ -34299,7 +34174,7 @@ /area/engine/break_room) "bvu" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/table, /obj/item/paper_bin{ @@ -34331,7 +34206,7 @@ "bvw" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -25 + pixel_x = -24 }, /obj/structure/showcase{ density = 0; @@ -34369,7 +34244,6 @@ }) "bvy" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters{ density = 0; dir = 2; @@ -34379,6 +34253,7 @@ opacity = 0 }, /obj/structure/cable/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/ntrep) "bvz" = ( @@ -34441,7 +34316,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -34453,6 +34327,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -34464,32 +34339,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bvH" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) @@ -34504,15 +34362,15 @@ d2 = 4; icon_state = "2-4" }, -/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, /area/hallway/primary/port) "bvL" = ( @@ -34521,9 +34379,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -34531,6 +34386,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvM" = ( @@ -34544,15 +34402,15 @@ d2 = 4; icon_state = "1-4" }, -/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, /area/hallway/primary/port) "bvN" = ( @@ -34561,13 +34419,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvO" = ( @@ -34576,16 +34434,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - sortType = 3 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvQ" = ( @@ -34599,29 +34456,14 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bvR" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) @@ -34641,6 +34483,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvU" = ( @@ -34654,13 +34499,16 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bvW" = ( @@ -34940,7 +34788,6 @@ }) "bwt" = ( /obj/structure/table/wood, -/obj/item/stamp/captain, /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/wood, /area/crew_quarters/captain{ @@ -35019,18 +34866,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bwD" = ( +/obj/structure/grille, /obj/structure/disposalpipe/segment{ - dir = 4; + dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bwE" = ( +/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bwF" = ( /obj/structure/transit_tube{ icon_state = "E-SW-NW" @@ -35049,9 +34898,6 @@ name = "Bar Maintenance"; req_access_txt = "25" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/bar) "bwH" = ( @@ -35063,11 +34909,10 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bwI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/aft) "bwL" = ( /obj/structure/transit_tube, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -35109,23 +34954,18 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bwP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/aft) "bwR" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 2; - sortType = 19 - }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwS" = ( @@ -35142,7 +34982,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "bwT" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -35399,7 +35238,7 @@ "bxr" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35712,12 +35551,12 @@ }, /area/hallway/primary/port) "bxQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -35762,7 +35601,7 @@ "bxX" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -35866,9 +35705,14 @@ codes_txt = "patrol;next_patrol=7-Command-Starboard"; location = "6-Port-Central" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Custodial Junction"; + sortType = 22 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "byi" = ( @@ -36096,8 +35940,8 @@ name = "Captain's Desk"; req_access_txt = "20" }, -/obj/structure/disposalpipe/segment, /obj/item/stamp/captain, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -36131,10 +35975,7 @@ }) "byD" = ( /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -36142,9 +35983,6 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "byE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -36153,17 +35991,20 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "20;12" }, -/turf/simulated/floor/plating, -/area/maintenance/maintcentral) -"byF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/maintcentral) +"byF" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -36175,10 +36016,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -36186,6 +36023,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction{ + name = "Captain's Junction"; + sortType = 18 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "byH" = ( @@ -36238,20 +36079,12 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byM" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -36337,9 +36170,6 @@ /area/engine/break_room) "byY" = ( /obj/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -30 @@ -36371,6 +36201,7 @@ /obj/structure/sign/securearea{ pixel_x = 32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "blackcorner" }, @@ -36700,28 +36531,28 @@ }, /area/hallway/primary/port) "bzD" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Port Primary Hallway - Port"; dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/hallway/primary/port) "bzE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -36806,10 +36637,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - sortType = 15 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -36821,6 +36648,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "HoP Junction"; + sortType = 15 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bzR" = ( @@ -36829,15 +36661,15 @@ d2 = 8; icon_state = "4-8" }, -/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{ icon_state = "neutralcorner" }, @@ -36854,15 +36686,15 @@ req_access = null; req_access_txt = "57" }, -/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/wood, /area/crew_quarters/heads) "bzT" = ( @@ -36871,16 +36703,16 @@ d2 = 8; icon_state = "4-8" }, -/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/carpet, /area/crew_quarters/heads) "bzU" = ( @@ -37024,9 +36856,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet{ - icon_state = "carpet6-2" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -37036,24 +36866,26 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/carpet{ - icon_state = "carpet14-10" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bAo" = ( -/turf/simulated/floor/carpet{ - icon_state = "carpet14-10" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" }) "bAp" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet{ - icon_state = "carpet14-10" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -37062,9 +36894,7 @@ c_tag = "Captain's Office"; dir = 8 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet10-8" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -37117,7 +36947,6 @@ name = "Bar Storage"; req_access_txt = "25" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -37138,12 +36967,14 @@ /turf/simulated/floor/carpet, /area/crew_quarters/bar) "bAy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bAz" = ( @@ -37151,13 +36982,15 @@ pixel_x = 2; pixel_y = 2 }, -/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bAA" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -25 + pixel_x = -24 }, /obj/machinery/light/small{ dir = 8 @@ -37725,6 +37558,9 @@ /turf/simulated/floor/carpet, /area/bridge) "bBV" = ( +/obj/machinery/light_switch{ + pixel_y = -24 + }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -37779,10 +37615,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light_switch{ - pixel_x = 38; - pixel_y = -4 - }, /obj/machinery/door_control{ id = "hopqueue"; name = "Queue Shutters Control"; @@ -37802,6 +37634,10 @@ pixel_x = 38; pixel_y = 6 }, +/obj/machinery/door_control/ticket_machine_button{ + pixel_x = 39; + pixel_y = -4 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads) "bCd" = ( @@ -37855,16 +37691,16 @@ }, /area/bridge) "bCi" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -37873,13 +37709,13 @@ name = "\improper Command Hallway" }) "bCj" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) "bCk" = ( @@ -37916,15 +37752,6 @@ products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/random = 4) }, /turf/simulated/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) -"bCn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet{ - icon_state = "carpet7-3" - }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -37959,13 +37786,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/chair/comfy/brown{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -37979,9 +37806,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet11-12" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -38034,13 +37859,12 @@ /area/crew_quarters/bar) "bCz" = ( /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "bar" + icon_state = "purplecorner" }, -/area/crew_quarters/bar) +/area/hallway/primary/aft) "bCA" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -38059,7 +37883,7 @@ "bCB" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38097,9 +37921,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bCG" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/medical/research) "bCH" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -38336,10 +38166,6 @@ }, /area/tcommsat/computer) "bDk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -38351,6 +38177,10 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "bDl" = ( @@ -38481,7 +38311,7 @@ "bDx" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -38526,7 +38356,7 @@ "bDB" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -38845,9 +38675,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet6-2" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -38858,9 +38686,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet15-11" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -38907,9 +38733,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet11-12" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -39019,26 +38843,18 @@ name = "\improper Command Hallway" }) "bEy" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/chair/stool{ pixel_y = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bEz" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEA" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -39050,18 +38866,28 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bEC" = ( /obj/structure/chair/wood/wings{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bED" = ( /obj/machinery/light/small{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bEE" = ( @@ -39071,13 +38897,13 @@ name = "Mr. Deempisi portrait"; pixel_y = 28 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/machinery/light_switch{ pixel_x = 25 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -39110,7 +38936,7 @@ /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/table, /obj/item/storage/box, @@ -39193,7 +39019,7 @@ "bEQ" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39277,7 +39103,7 @@ /area/atmos) "bEY" = ( /obj/machinery/alarm{ - pixel_y = 25 + pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Atmospherics - Distro Loop" @@ -39308,6 +39134,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -39731,9 +39558,7 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet5-1" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -39752,11 +39577,12 @@ }, /area/hallway/primary/port) "bFX" = ( -/turf/simulated/floor/carpet{ - icon_state = "carpetside" +/obj/machinery/light/small{ + dir = 4 }, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" }) "bFY" = ( /obj/structure/table/wood, @@ -39790,6 +39616,9 @@ icon_state = "0-4" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -39889,12 +39718,13 @@ /turf/simulated/floor/plating, /area/bridge) "bGl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/chair/stool{ - pixel_y = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "bGp" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -39939,7 +39769,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/purple, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -39947,6 +39776,7 @@ }, /area/hallway/primary/starboard) "bGt" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -39971,6 +39801,7 @@ /obj/machinery/atm{ pixel_x = 32 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -40001,10 +39832,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -40249,7 +40077,7 @@ pixel_y = 3 }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light_switch{ pixel_x = -26 @@ -40300,7 +40128,7 @@ /obj/machinery/computer/message_monitor, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -40461,9 +40289,7 @@ "bHz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet{ - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -40488,9 +40314,7 @@ pixel_y = -29 }, /mob/living/simple_animal/pet/dog/fox/Renault, -/turf/simulated/floor/carpet{ - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -40508,12 +40332,8 @@ /area/bridge) "bHE" = ( /obj/structure/disposalpipe/segment, -/obj/item/toy/cards/deck{ - pixel_y = 4 - }, -/obj/structure/table/wood/poker, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/maintenance/aft) "bHG" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -40525,14 +40345,11 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/turf/simulated/floor/carpet{ - icon_state = "carpet9-4" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bHI" = ( -/obj/structure/disposalpipe/segment, /obj/item/clothing/mask/cigarette/cigar, /obj/structure/table/wood/poker, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -40584,6 +40401,7 @@ }, /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) "bHN" = ( @@ -40669,6 +40487,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -40731,16 +40550,16 @@ }, /area/atmos) "bIh" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/toy/cards/deck{ - pixel_y = 4 +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/obj/structure/table/wood/poker, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/medical/reception) "bIi" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -40833,19 +40652,12 @@ }, /turf/space, /area/space/nearstation) -"bIv" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/wall/r_wall, -/area/atmos) "bIw" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -40853,18 +40665,13 @@ pressure_checks = 2; pump_direction = 0 }, -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bIx" = ( -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 +/obj/machinery/camera{ + c_tag = "Atmospherics Waste Tank" }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bIy" = ( /obj/item/radio/intercom{ @@ -40872,9 +40679,7 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/turf/simulated/floor/carpet{ - icon_state = "carpetside" - }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -40920,6 +40725,7 @@ /obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -41057,27 +40863,27 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bJd" = ( -/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 = 4; icon_state = "neutralcorner" @@ -41085,9 +40891,6 @@ /area/hallway/primary/central) "bJe" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Command Hallway" }, @@ -41097,6 +40900,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41105,15 +40911,15 @@ name = "\improper Command Hallway" }) "bJf" = ( -/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 = 1; icon_state = "neutralcorner" @@ -41122,15 +40928,15 @@ name = "\improper Command Hallway" }) "bJg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41139,9 +40945,6 @@ name = "\improper Command Hallway" }) "bJh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -41151,6 +40954,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41164,15 +40970,15 @@ d2 = 2; icon_state = "1-2" }, -/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 = 1; icon_state = "neutralcorner" @@ -41181,15 +40987,15 @@ name = "\improper Command Hallway" }) "bJj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -41228,15 +41034,15 @@ }, /area/tcommsat/computer) "bJn" = ( -/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 = 1; icon_state = "neutral" @@ -41245,15 +41051,15 @@ name = "\improper Command Hallway" }) "bJp" = ( -/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 = 4; icon_state = "neutralcorner" @@ -41267,11 +41073,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -41280,16 +41086,16 @@ name = "\improper Command Hallway" }) "bJr" = ( -/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 = 1; icon_state = "neutral" @@ -41414,7 +41220,7 @@ }) "bJB" = ( /obj/machinery/alarm{ - pixel_y = 32 + pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41474,6 +41280,12 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "Bar Junction"; + sortType = 19 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bJG" = ( @@ -41487,6 +41299,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/bar) "bJH" = ( @@ -41494,6 +41309,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -41508,6 +41326,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -41519,6 +41340,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -41608,7 +41435,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 10 }, @@ -41762,27 +41588,19 @@ id_tag = "waste_sensor"; output = 63 }, -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bKi" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bKj" = ( /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/wood, /area/library) @@ -41798,11 +41616,6 @@ "bKl" = ( /turf/simulated/wall/r_wall, /area/tcommsat/server) -"bKm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bKn" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ @@ -41925,8 +41738,8 @@ /area/library) "bKx" = ( /obj/structure/lattice, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/insulated, +/obj/structure/disposalpipe/segment, /turf/space, /area/space/nearstation) "bKy" = ( @@ -41939,7 +41752,7 @@ name = "Port Maintenance" }) "bKz" = ( -/obj/machinery/light_construct{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/wood, @@ -41994,7 +41807,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -42006,6 +41818,7 @@ }, /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) "bKM" = ( @@ -42086,7 +41899,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -42297,16 +42110,16 @@ layer = 4; pixel_y = 32 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -42402,6 +42215,7 @@ }, /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) "bLv" = ( @@ -42505,21 +42319,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) +/area/medical/chemistry) "bLI" = ( /obj/structure/chair/wood/wings, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bLJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bLK" = ( @@ -42535,9 +42346,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bLM" = ( @@ -42551,9 +42359,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) "bLO" = ( @@ -42576,10 +42381,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -42587,12 +42388,13 @@ }, /area/hallway/primary/starboard) "bLQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -42618,15 +42420,15 @@ name = "Station Intercom (General)"; pixel_y = 21 }, -/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 = 1; icon_state = "neutralcorner" @@ -42635,36 +42437,36 @@ name = "\improper Command Hallway" }) "bLT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/atmos) "bLU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 8; name = "Air to External" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/atmos) "bLV" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -42672,10 +42474,6 @@ }, /area/atmos) "bLW" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -42690,6 +42488,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -42790,25 +42592,23 @@ /turf/space, /area/space/nearstation) "bMk" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/green{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/structure/grille, +/obj/machinery/meter, /turf/simulated/wall/r_wall, /area/atmos) "bMl" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; + icon_state = "on"; id = "waste_in"; + on = 1; pixel_y = 1 }, -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bMm" = ( /obj/machinery/power/apc{ @@ -42969,7 +42769,6 @@ name = "Arrivals" }) "bMC" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -43133,6 +42932,10 @@ }, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, +/obj/machinery/ticket_machine{ + layer = 4; + pixel_x = -32 + }, /turf/simulated/floor/plasteel, /area/bridge/meeting_room{ name = "\improper Command Hallway" @@ -43310,37 +43113,19 @@ name = "\improper Teleporter Room" }) "bNx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria" + icon_state = "white" }, -/area/crew_quarters/kitchen) -"bNz" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria" - }, -/area/crew_quarters/kitchen) +/area/medical/medbay3) "bNA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -43361,9 +43146,6 @@ name = "Kitchen Cold Room"; req_access_txt = "28" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -43375,9 +43157,6 @@ }, /area/crew_quarters/kitchen) "bNC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_y = -26 }, @@ -43390,12 +43169,9 @@ }, /area/crew_quarters/kitchen) "bND" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Kitchen - Coldroom"; @@ -43420,12 +43196,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bNF" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "bNG" = ( @@ -43464,9 +43240,6 @@ }, /area/hallway/primary/starboard) "bNK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/plasticflaps{ opacity = 1 }, @@ -43486,12 +43259,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/atmos) -"bNL" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/atmos) +"bNL" = ( /obj/machinery/door/window/northleft{ dir = 4; name = "Inner Pipe Access"; @@ -43511,6 +43284,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bNM" = ( @@ -43566,15 +43342,16 @@ /turf/simulated/floor/plating, /area/gateway) "bNT" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, /obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/gateway) "bNU" = ( @@ -43654,8 +43431,8 @@ name = "Teleport Access"; req_one_access_txt = "17;19" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -43845,10 +43622,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -44009,15 +43782,7 @@ /turf/simulated/floor/wood, /area/ntrep) "bOO" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - Mix"; - dir = 8 - }, -/turf/simulated/floor/engine{ - name = "vacuum floor"; - nitrogen = 0.01; - oxygen = 0.01 - }, +/turf/simulated/floor/engine/vacuum, /area/atmos) "bOP" = ( /obj/structure/cable/yellow{ @@ -44084,6 +43849,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bOX" = ( @@ -44259,8 +44025,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -44398,6 +44164,7 @@ dir = 8; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -44471,10 +44238,6 @@ }, /area/security/podbay) "bPO" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/foodcart, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -44570,7 +44333,9 @@ dir = 1 }, /obj/structure/closet/secure_closet/medical2, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "bQb" = ( /obj/structure/closet/firecloset, @@ -44643,10 +44408,7 @@ name = "E.V.A. Storage" }) "bQi" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/stack/sheet/rglass{ amount = 50 }, @@ -44768,7 +44530,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -44808,6 +44570,7 @@ /obj/machinery/door/firedoor, /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) "bQI" = ( @@ -44935,6 +44698,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bQV" = ( @@ -44942,20 +44706,24 @@ pixel_x = 6; pixel_y = -30 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -30 - }, /obj/machinery/computer/card/minor/cmo, +/obj/machinery/keycard_auth{ + pixel_x = -26; + pixel_y = -7 + }, +/obj/machinery/door_control{ + id = "cmoprivacy"; + name = "Privacy Shutters Control"; + pixel_x = -26; + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) "bQW" = ( -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -44980,10 +44748,7 @@ }, /area/crew_quarters/hor) "bQX" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/crowbar, /obj/item/storage/toolbox/emergency, /obj/item/radio/off, @@ -45085,7 +44850,8 @@ "bRn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ - name = "Coroner" + name = "Morgue"; + req_access_txt = "6" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45249,7 +45015,7 @@ /turf/simulated/floor/wood, /area/security/vacantoffice) "bRC" = ( -/obj/machinery/light_construct{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/wood, @@ -45262,10 +45028,7 @@ name = "Port Maintenance" }) "bRE" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" @@ -45488,8 +45251,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -45539,10 +45302,7 @@ /turf/simulated/floor/wood, /area/ntrep) "bSh" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 @@ -45635,7 +45395,7 @@ "bSq" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ @@ -45684,32 +45444,26 @@ }, /area/crew_quarters/kitchen) "bSv" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bSw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria" + dir = 8; + icon_state = "whiteblue" }, -/area/crew_quarters/kitchen) +/area/medical/medbay3) "bSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/sink/kitchen{ pixel_y = 28 }, @@ -45756,18 +45510,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bSC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/medical/medbay3) "bSD" = ( /obj/machinery/door/poddoor{ density = 0; @@ -45918,6 +45669,7 @@ name = "Disposals Chute"; pixel_x = -1 }, +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/disposal/deliveryChute{ dir = 8; name = "disposals chute"; @@ -45926,7 +45678,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -45941,10 +45692,12 @@ }, /area/atmos) "bSV" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; + icon_state = "on"; id = "n2o_in"; + on = 1; pixel_y = 1 }, /turf/simulated/floor/engine/n20, @@ -45975,28 +45728,11 @@ icon_state = "dark" }, /area/medical/morgue) -"bSY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, -/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/medical/morgue) "bSZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ - name = "Morgue" + name = "Morgue"; + req_access_txt = "6" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -46004,6 +45740,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46019,7 +45758,7 @@ /area/medical/morgue) "bTb" = ( /obj/machinery/alarm{ - pixel_y = 32 + pixel_y = 24 }, /obj/structure/morgue, /turf/simulated/floor/plasteel{ @@ -46027,9 +45766,6 @@ }, /area/medical/morgue) "bTc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -46051,9 +45787,6 @@ /obj/structure/chair/wood/wings{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bTe" = ( @@ -46072,12 +45805,11 @@ }, /area/medical/paramedic) "bTf" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight, -/obj/item/radio, -/obj/machinery/camera{ - c_tag = "Engineering Equipment East"; - dir = 8 +/obj/machinery/computer/security{ + network = list("SS13","Research Outpost","Mining Outpost") + }, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46089,6 +45821,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/effect/landmark/start{ + name = "Security Pod Pilot" + }, +/obj/structure/chair/office/dark{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46113,14 +45851,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/northeast, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -46161,7 +45899,6 @@ pixel_y = -32 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03"; layer = 4.1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -46216,7 +45953,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/cable/yellow{ d1 = 4; @@ -46231,10 +45968,7 @@ }, /area/hallway/primary/fore) "bTr" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/rack_parts, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, @@ -46284,7 +46018,7 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/wood, /area/library) @@ -46411,7 +46145,7 @@ "bTK" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -46459,13 +46193,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bTR" = ( /obj/structure/closet/secure_closet/medical1, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -46535,7 +46270,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -46611,6 +46345,7 @@ /area/maintenance/starboard) "bUq" = ( /obj/vehicle/ambulance, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -46633,6 +46368,7 @@ /obj/machinery/atmospherics/trinary/filter{ dir = 1; filter_type = 4; + name = "Gas filter (N2O tank)"; on = 1 }, /obj/structure/window/reinforced{ @@ -46645,12 +46381,21 @@ }, /area/atmos) "bUu" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - N2O"; - dir = 8 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/engine/n20, -/area/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "Robotics Junction"; + sortType = 14 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "bUv" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; @@ -46730,9 +46475,6 @@ name = "Arrivals" }) "bUC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -46824,7 +46566,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -46957,7 +46699,7 @@ /area/blueshield) "bUY" = ( /obj/structure/table/wood, -/obj/item/paper_bin, +/obj/item/paper_bin/nanotrasen, /obj/item/pen/blue, /obj/item/folder/blue{ pixel_x = 4; @@ -47076,7 +46818,6 @@ /turf/simulated/floor/plasteel, /area/gateway) "bVi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "1;4;38;12" }, @@ -47149,6 +46890,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -47167,6 +46909,9 @@ /obj/effect/landmark/start{ name = "Cook" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -47180,8 +46925,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/item/cigbutt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "bVs" = ( @@ -47204,6 +46949,9 @@ /area/crew_quarters/kitchen) "bVt" = ( /obj/machinery/kitchen_machine/candy_maker, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -47285,6 +47033,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bVC" = ( @@ -47300,9 +47052,9 @@ }, /area/medical/research) "bVD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) @@ -47452,6 +47204,7 @@ dir = 8; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -47465,12 +47218,22 @@ /turf/simulated/floor/engine/plasma, /area/atmos) "bVW" = ( -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/engine/plasma, -/area/atmos) +/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, +/area/hallway/primary/port) "bVX" = ( /obj/structure/bed, /obj/effect/decal/cleanable/cobweb2, @@ -47556,7 +47319,7 @@ "bWh" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/structure/cable/yellow{ d1 = 2; @@ -47616,7 +47379,6 @@ name = "Port Maintenance" }) "bWp" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -47819,7 +47581,7 @@ /area/ntrep) "bWO" = ( /obj/structure/table/wood, -/obj/item/paper_bin, +/obj/item/paper_bin/nanotrasen, /obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 12 @@ -47879,11 +47641,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 2; - sortType = 18 - }, /obj/effect/decal/warning_stripes/west, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bWU" = ( @@ -47985,6 +47747,9 @@ /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -47992,11 +47757,13 @@ /area/crew_quarters/kitchen) "bXi" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "purple" + }, +/area/hallway/primary/aft) "bXj" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/binary/pump{ @@ -48075,7 +47842,7 @@ /obj/item/clothing/mask/cigarette/pipe, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Theatre - Backstage"; @@ -48289,10 +48056,10 @@ network = list("Turbine") }, /obj/structure/lattice, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/space, /area/space/nearstation) "bXP" = ( @@ -48305,11 +48072,15 @@ }, /area/hallway/primary/central) "bXQ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "vault" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/area/crew_quarters/locker) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "bXR" = ( /obj/item/taperecorder, /obj/item/camera, @@ -48564,6 +48335,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -48579,6 +48354,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -48627,21 +48405,15 @@ name = "Port Maintenance" }) "bYy" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bYA" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) +"bYA" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -48652,9 +48424,6 @@ }, /area/hydroponics) "bYB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -48666,9 +48435,6 @@ }, /area/hydroponics) "bYC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -48692,30 +48458,15 @@ icon_state = "cafeteria" }, /area/crew_quarters/kitchen) -"bYF" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) "bYG" = ( /obj/machinery/portable_atmospherics/canister, /turf/simulated/floor/plating, /area/maintenance/starboard) "bYI" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -48723,6 +48474,12 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/hor) "bYJ" = ( @@ -48771,10 +48528,12 @@ /turf/simulated/floor/wood, /area/ntrep) "bYO" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; + icon_state = "on"; id = "tox_in"; + on = 1; pixel_y = 1 }, /turf/simulated/floor/engine/plasma, @@ -48858,16 +48617,7 @@ name = "Port Maintenance" }) "bYX" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -48875,6 +48625,17 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/hor) "bYY" = ( @@ -48900,9 +48661,9 @@ }) "bZa" = ( /obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 +/obj/item/paper_bin/nanotrasen, +/obj/machinery/status_display/supply_display{ + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -48912,7 +48673,7 @@ "bZb" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/power/apc{ name = "Kitchen APC"; @@ -48968,13 +48729,13 @@ /turf/simulated/floor/wood, /area/library) "bZg" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 27 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/library) "bZh" = ( @@ -49125,9 +48886,6 @@ name = "\improper Teleporter Room" }) "bZB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -49139,9 +48897,6 @@ }, /area/hydroponics) "bZC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -49164,27 +48919,15 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/gateway) -"bZF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bZG" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, /obj/machinery/portable_atmospherics/canister, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -49207,6 +48950,7 @@ "bZK" = ( /obj/machinery/atmospherics/trinary/filter{ dir = 1; + name = "Gas filter (Toxins tank)"; on = 1 }, /obj/structure/window/reinforced{ @@ -49218,10 +48962,6 @@ }, /area/atmos) "bZL" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 0; - name = "Port to Filter" - }, /obj/machinery/light/small{ dir = 8 }, @@ -49229,6 +48969,7 @@ c_tag = "Atmospherics - Starboard"; dir = 4 }, +/obj/machinery/atmospherics/binary/valve/digital, /turf/simulated/floor/plasteel, /area/atmos) "bZM" = ( @@ -49239,11 +48980,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "bZN" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - Toxins"; - dir = 8 - }, -/turf/simulated/floor/engine/plasma, +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, /area/atmos) "bZO" = ( /obj/effect/decal/cleanable/dirt, @@ -49302,7 +49040,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/wood, /area/library) @@ -49324,15 +49062,15 @@ /turf/simulated/floor/wood, /area/library) "cac" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/library) "cad" = ( @@ -49340,14 +49078,14 @@ name = "Library Maintenance"; req_one_access_txt = "12;37" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -49416,11 +49154,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"cal" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/crew_quarters/kitchen) "can" = ( /obj/machinery/firealarm{ pixel_y = 28 @@ -49435,10 +49168,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "cap" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/landmark{ name = "blobstart" }, @@ -49522,6 +49251,10 @@ /obj/machinery/newscaster{ pixel_x = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49532,13 +49265,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=11-Command-Port"; location = "10.2-Aft-Port-Corner" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caD" = ( @@ -49627,11 +49363,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/decal/warning_stripes/west, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -49701,10 +49437,6 @@ }, /area/hallway/primary/central) "caS" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/door/window/eastright{ dir = 1; name = "Kitchen Delivery"; @@ -49735,27 +49467,11 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) -"caV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" - }, -/turf/simulated/floor/plating, -/area/hydroponics) "caW" = ( /obj/item/trash/candy, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -49770,18 +49486,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "caY" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -49789,10 +49497,17 @@ name = "privacy shutters"; opacity = 0 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/hor) "caZ" = ( /mob/living/simple_animal/mouse, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "cba" = ( @@ -49860,9 +49575,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/hor) "cbg" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 8; - name = "Port to Filter" +/obj/machinery/atmospherics/binary/valve/digital{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -49894,6 +49608,7 @@ dir = 8; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -49987,7 +49702,9 @@ /area/maintenance/aft) "cbx" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -50003,13 +49720,19 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Library Junction"; + sortType = 16 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbC" = ( @@ -50096,10 +49819,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbJ" = ( -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -5 - }, /obj/machinery/status_display{ layer = 4; pixel_y = 32 @@ -50122,6 +49841,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -50393,6 +50116,12 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "Hydroponics Junction"; + sortType = 21 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ccs" = ( @@ -50409,13 +50138,12 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "cct" = ( -/obj/structure/rack{ +/obj/machinery/atmospherics/binary/pump{ dir = 8; - layer = 2.9 + name = "Port to Filter" }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/maintenance/aft) +/turf/simulated/floor/plasteel, +/area/atmos) "ccu" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -50448,10 +50176,12 @@ /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "ccz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -50468,27 +50198,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/engine/engineering) -"ccA" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "ccB" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - icon_state = "pipe-j2s"; - sortType = 16 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -50499,6 +50212,10 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -50509,12 +50226,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5;39;37;25;28" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -50525,9 +50242,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "vault" @@ -50540,7 +50256,8 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -50553,14 +50270,14 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Aft-Port Corner"; dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -50572,7 +50289,10 @@ "ccI" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -50593,19 +50313,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"ccS" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -50629,7 +50336,10 @@ "ccU" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -50641,6 +50351,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" @@ -50699,10 +50410,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "cdi" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 2; - sortType = 20 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -50740,6 +50447,10 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -50752,8 +50463,7 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -50770,25 +50480,29 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -50819,6 +50533,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50830,10 +50547,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -50845,6 +50565,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50856,6 +50579,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -50868,6 +50594,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "cdx" = ( @@ -50878,6 +50607,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "cdy" = ( @@ -50893,10 +50625,12 @@ /turf/simulated/floor/plating, /area/maintenance/portsolar) "cdz" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; + icon_state = "on"; id = "co2_in"; + on = 1; pixel_y = 1 }, /turf/simulated/floor/engine/co2, @@ -50948,6 +50682,9 @@ c_tag = "Central Primary Hallway - Aft-Starboard Corner"; dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -50961,12 +50698,14 @@ name = "Port Maintenance" }) "cdG" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +/obj/machinery/light{ + dir = 1; + on = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" }) "cdH" = ( /obj/structure/closet, @@ -51027,6 +50766,7 @@ /obj/machinery/atmospherics/trinary/filter{ dir = 1; filter_type = 3; + name = "Gas filter (CO2 tank)"; on = 1 }, /obj/structure/window/reinforced{ @@ -51048,11 +50788,11 @@ /turf/simulated/floor/engine/vacuum, /area/space/nearstation) "cdS" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - CO2"; - dir = 8 +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Port to Turbine" }, -/turf/simulated/floor/engine/co2, +/turf/simulated/floor/plasteel, /area/atmos) "cdT" = ( /turf/simulated/wall, @@ -51060,15 +50800,17 @@ name = "Medbay Storage" }) "cdU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + icon_state = "pipe-j2s"; + name = "Medbay Junction"; + sortType = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -51147,7 +50889,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -51166,13 +50907,13 @@ }, /area/hallway/primary/central) "cej" = ( +/obj/machinery/newscaster{ + pixel_y = -29 + }, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/newscaster{ - pixel_y = -29 - }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -51181,11 +50922,14 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;7;35;8;47" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cel" = ( -/obj/machinery/door/airlock/medical{ - name = "Paramedic" +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Paramedic"; + req_access_txt = "66" }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -51193,6 +50937,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -51231,8 +50978,10 @@ }, /area/hydroponics) "ceq" = ( -/obj/machinery/door/airlock/medical{ - name = "Paramedic" +/obj/machinery/door/airlock/medical/glass{ + id_tag = null; + name = "Paramedic"; + req_access_txt = "66" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -51307,37 +51056,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cez" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"ceA" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ceD" = ( @@ -51367,8 +51085,8 @@ /turf/simulated/floor/plasteel, /area/atmos) "ceI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -51397,6 +51115,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -51443,9 +51164,6 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/window/northleft{ dir = 8; name = "MuleBot Access"; @@ -51462,14 +51180,21 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/starboard) "ceS" = ( /obj/structure/bed/amb_trolley, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -51521,7 +51246,7 @@ /area/quartermaster/office) "ceY" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/table, /obj/item/paper_bin{ @@ -51539,7 +51264,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5;39;25;28" }, @@ -51571,10 +51295,7 @@ /area/maintenance/aft) "cfd" = ( /obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -51662,10 +51383,7 @@ }, /obj/item/storage/secure/briefcase, /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 4 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -51714,10 +51432,7 @@ /area/maintenance/aft) "cfn" = ( /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen{ pixel_x = -3; pixel_y = 5 @@ -51789,7 +51504,6 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, @@ -51811,10 +51525,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/starboard) "cfz" = ( @@ -51839,6 +51556,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -51937,6 +51655,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plating, /area/maintenance/incinerator) "cfM" = ( @@ -51967,11 +51687,7 @@ /turf/simulated/floor/plasteel, /area/atmos) "cfQ" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "N2 to Airmix"; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel, /area/atmos) "cfR" = ( @@ -51995,12 +51711,12 @@ }, /area/hydroponics) "cfT" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 }, /obj/machinery/camera{ c_tag = "Atmospherics - Port-Aft"; @@ -52030,16 +51746,6 @@ "cfW" = ( /turf/simulated/floor/bluegrid, /area/maintenance/aft) -"cfX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cfY" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -52064,6 +51770,7 @@ /area/maintenance/aft) "cgc" = ( /obj/machinery/atmospherics/trinary/mixer{ + name = "Gas mixer (N2/O2)"; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; @@ -52072,9 +51779,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "cgd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Hydroponics Backroom"; @@ -52089,37 +51793,16 @@ }, /turf/simulated/floor/plasteel, /area/hydroponics) -"cge" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) -"cgf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) "cgh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "cgi" = ( @@ -52148,9 +51831,6 @@ /turf/simulated/floor/plating/airless, /area/maintenance/portsolar) "cgl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -52420,6 +52100,10 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -52430,6 +52114,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -52445,29 +52132,29 @@ name = "Hydroponics"; req_access_txt = "35" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, /area/hydroponics) "cgQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" }, /area/hydroponics) "cgR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52479,9 +52166,6 @@ }, /area/hydroponics) "cgS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52493,9 +52177,6 @@ }, /area/hydroponics) "cgT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52531,10 +52212,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/disposal, /obj/structure/sign/deathsposal{ pixel_y = 32 }, +/obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plating, /area/maintenance/incinerator) @@ -52582,6 +52263,7 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plating, /area/maintenance/starboard) "chf" = ( @@ -52629,8 +52311,9 @@ /turf/simulated/floor/plasteel, /area/atmos) "chk" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "O2 to Pure" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -52646,10 +52329,7 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "chn" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, @@ -52662,24 +52342,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"chp" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -52741,7 +52403,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -52762,53 +52423,21 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/aft) -"chA" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - sortType = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "chB" = ( /obj/item/cigbutt, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/aft) "chC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5" }, /turf/simulated/floor/plating, /area/maintenance/aft) -"chD" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/sortjunction{ - sortType = 21 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "chE" = ( /obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; @@ -52855,6 +52484,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52870,6 +52500,7 @@ id_tag = "paramedic"; name = "Paramedic Garage" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/paramedic) "chO" = ( @@ -52883,6 +52514,7 @@ name = "Hydroponics Storage"; req_access_txt = "35" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -52910,8 +52542,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/plasteel{ @@ -52984,12 +52616,12 @@ }, /area/medical/paramedic) "chX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -53009,7 +52641,7 @@ "chZ" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ @@ -53037,6 +52669,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -53048,7 +52683,6 @@ icon_state = "1-2" }, /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -53064,6 +52698,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -53097,6 +52732,7 @@ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cio" = ( @@ -53153,11 +52789,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/plating, /area/maintenance/incinerator) "civ" = ( @@ -53179,10 +52812,10 @@ }, /area/atmos) "ciw" = ( +/obj/effect/decal/warning_stripes/east, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/aft) "ciy" = ( @@ -53195,10 +52828,6 @@ name = "\improper Warehouse" }) "ciz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, @@ -53248,10 +52877,6 @@ name = "Inner Pipe Access"; req_access_txt = "24" }, -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "O2 to Pure" - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, @@ -53296,8 +52921,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -53310,6 +52935,10 @@ /turf/simulated/floor/plating, /area/atmos) "ciJ" = ( +/obj/machinery/alarm/all_access{ + dir = 8; + pixel_x = 24 + }, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -53317,14 +52946,9 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/alarm{ - desc = "This particular atmos control unit appears to have no access restrictions."; - dir = 8; - locked = 0; - name = "all-access air alarm"; - pixel_x = 24; - req_access = "0"; - req_one_access = "0" +/obj/effect/landmark{ + name = "xeno_spawn"; + pixel_x = -1 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -53351,6 +52975,7 @@ /obj/machinery/atmospherics/trinary/filter{ dir = 4; filter_type = 2; + name = "Gas filter (N2 tank)"; on = 1 }, /obj/structure/window/reinforced, @@ -53376,10 +53001,8 @@ /area/atmos) "ciO" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "Nitrogen Outlet"; - on = 1 +/obj/machinery/atmospherics/binary/valve/digital/open{ + name = "Nitrogen Outlet Valve" }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -53408,6 +53031,7 @@ /obj/machinery/atmospherics/trinary/filter{ dir = 4; filter_type = 1; + name = "Gas filter (O2 tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -53432,10 +53056,8 @@ /area/atmos) "ciS" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "O2 to Airmix"; - on = 1 +/obj/machinery/atmospherics/binary/valve/digital/open{ + name = "Oxygen Outlet Valve" }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -53532,6 +53154,10 @@ name = "Medbay Storage" }) "ciZ" = ( +/obj/machinery/light_switch{ + pixel_y = -28 + }, +/obj/effect/decal/warning_stripes/northeast, /obj/machinery/disposal{ pixel_x = -2; pixel_y = -2 @@ -53539,10 +53165,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/light_switch{ - pixel_y = -28 - }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/hydroponics) "cja" = ( @@ -53648,10 +53270,7 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cjq" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8; - name = "output gas connector port" - }, +/obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister, /obj/structure/extinguisher_cabinet{ pixel_x = 31 @@ -53764,6 +53383,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -53772,17 +53392,14 @@ }) "cjB" = ( /obj/machinery/meter, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -53863,12 +53480,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cjL" = ( @@ -53877,13 +53494,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -53894,10 +53511,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -53964,7 +53577,7 @@ "cjZ" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/north, @@ -53993,21 +53606,18 @@ }, /area/maintenance/incinerator) "ckc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -54139,7 +53749,6 @@ /turf/space, /area/solar/port) "cks" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -54243,27 +53852,11 @@ icon_state = "white" }, /area/medical/reception) -"ckC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "ckD" = ( /obj/structure/grille, /turf/simulated/floor/plating, /area/maintenance/aft) "ckE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -30 @@ -54490,17 +54083,13 @@ "cla" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, /area/medical/research) "clb" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -54524,10 +54113,6 @@ }, /area/medical/research) "cld" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -54540,7 +54125,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/insulated, +/obj/machinery/atmospherics/binary/valve{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -54602,17 +54189,6 @@ /area/quartermaster/sorting{ name = "\improper Warehouse" }) -"clj" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cll" = ( /obj/item/wrench, /obj/item/clothing/suit/apron, @@ -54646,21 +54222,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/aft) -"clo" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "clp" = ( /obj/structure/cable/yellow, /obj/effect/spawner/window/reinforced, @@ -54672,24 +54233,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboard) -"clr" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cls" = ( /obj/item/storage/firstaid/regular{ pixel_x = 3; @@ -54739,13 +54285,15 @@ }, /area/maintenance/incinerator) "clz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/insulated, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -54762,11 +54310,12 @@ /turf/simulated/floor/plating, /area/assembly/robotics) "clD" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11 }, -/turf/simulated/wall/r_wall, -/area/maintenance/incinerator) +/turf/simulated/floor/plasteel, +/area/atmos) "clE" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -54815,16 +54364,14 @@ }, /area/medical/morgue) "clJ" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, -/turf/simulated/floor/plating, -/area/maintenance/aft) +/area/maintenance/incinerator) "clK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -55020,7 +54567,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -55093,16 +54640,6 @@ }, /area/medical/morgue) "cmv" = ( -/obj/machinery/door_control{ - id = "cmoprivacy"; - name = "Privacy Shutters Control"; - pixel_x = -26; - pixel_y = 4 - }, -/obj/machinery/keycard_auth{ - pixel_x = -26; - pixel_y = -7 - }, /obj/structure/filingcabinet/filingcabinet, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -55156,7 +54693,7 @@ /area/toxins/explab) "cmD" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/table/glass, /obj/item/stack/sheet/mineral/plasma{ @@ -55236,9 +54773,6 @@ /area/medical/exam_room) "cmJ" = ( /obj/item/storage/box/lights/mixed, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, @@ -55255,12 +54789,15 @@ /turf/space, /area/space/nearstation) "cmM" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/maintenance/incinerator) "cmN" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -55292,7 +54829,6 @@ /turf/simulated/floor/plating, /area/atmos) "cmR" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ id_tag = "ResearchFoyer"; @@ -55307,18 +54843,6 @@ icon_state = "whitepurple" }, /area/medical/research) -"cmS" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cmT" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -55328,11 +54852,6 @@ icon_state = "white" }, /area/medical/reception) -"cmU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fore) "cmX" = ( /turf/simulated/wall, /area/medical/exam_room) @@ -55353,9 +54872,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -55383,9 +54899,6 @@ }, /area/medical/morgue) "cnc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Coroner" }, @@ -55396,6 +54909,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55403,7 +54919,7 @@ "cnd" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -55563,9 +55079,9 @@ d2 = 4; icon_state = "2-4" }, -/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, /area/hallway/primary/aft) "cnu" = ( @@ -55670,6 +55186,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55710,7 +55229,6 @@ }, /area/medical/research) "cnH" = ( -/obj/item/storage/toolbox/emergency, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -55718,6 +55236,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -31 }, +/obj/machinery/computer/turbine_computer{ + id = "incineratorturbine" + }, /turf/simulated/floor/plating, /area/maintenance/incinerator) "cnI" = ( @@ -55776,24 +55297,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/aft) -"cnP" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cnQ" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -55804,10 +55310,7 @@ /area/maintenance/starboard) "cnS" = ( /obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, +/obj/item/paper_bin/nanotrasen, /obj/item/pen, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -55869,27 +55372,27 @@ name = "\improper Secure Lab" }) "cnY" = ( -/obj/machinery/atmospherics/pipe/simple, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/grille, +/obj/machinery/meter, /turf/simulated/wall/r_wall, /area/atmos) "cnZ" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/grille, /obj/machinery/meter{ id = "mair_in_meter"; name = "Mixed Air Tank In" }, -/obj/structure/grille, /turf/simulated/wall/r_wall, /area/atmos) "coa" = ( -/obj/machinery/atmospherics/pipe/simple, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/grille, /obj/machinery/meter{ id = "mair_out_meter"; name = "Mixed Air Tank Out" }, -/obj/structure/grille, /turf/simulated/wall/r_wall, /area/atmos) "cob" = ( @@ -55912,7 +55415,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -55947,38 +55449,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) -"cog" = ( -/obj/structure/disposalpipe/segment{ +"coi" = ( +/obj/machinery/bodyscanner{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) -"coh" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) -"coi" = ( -/obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" }, /area/medical/exam_room) "coj" = ( -/obj/structure/closet/secure_closet/personal/patient, +/obj/machinery/sleeper, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -55991,6 +55472,9 @@ /obj/machinery/camera{ c_tag = "Medbay Surgery 1 North" }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -56010,9 +55494,6 @@ /area/medical/morgue) "com" = ( /obj/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/morgue, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56056,9 +55537,6 @@ name = "Medbay Storage" }) "coq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -56073,29 +55551,19 @@ pixel_y = -24; req_access_txt = "12" }, +/obj/item/storage/toolbox/emergency, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/maintenance/incinerator) -"cos" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/morgue{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "cot" = ( /obj/machinery/light_switch{ pixel_x = 23 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -56118,6 +55586,8 @@ /obj/structure/sign/fire{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/insulated, +/obj/machinery/meter, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -56277,20 +55747,11 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/starboard) -"coJ" = ( +"coK" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) -"coK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -56314,10 +55775,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "coN" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/item/cane, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/north, @@ -56417,7 +55875,6 @@ name = "\improper Command Hallway" }) "cpd" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -56471,10 +55928,13 @@ name = "\improper Secure Lab" }) "cph" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; frequency = 1441; - id = "n2_in" + icon_state = "on"; + id = "n2_in"; + on = 1; + volume_rate = 200 }, /turf/simulated/floor/engine/n2, /area/atmos) @@ -56490,6 +55950,7 @@ dir = 1; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -56500,10 +55961,12 @@ /turf/simulated/floor/engine/n2, /area/atmos) "cpk" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; frequency = 1441; - id = "o2_in" + icon_state = "on"; + id = "o2_in"; + on = 1 }, /turf/simulated/floor/engine/o2, /area/atmos) @@ -56519,6 +55982,7 @@ dir = 1; external_pressure_bound = 0; frequency = 1441; + icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; @@ -56529,10 +55993,13 @@ /turf/simulated/floor/engine/o2, /area/atmos) "cpn" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; - frequency = 1443; - id = "air_in" + frequency = 1441; + icon_state = "on"; + id = "o2_in"; + on = 1; + volume_rate = 200 }, /turf/simulated/floor/engine/air, /area/atmos) @@ -56640,28 +56107,16 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/plating, /area/maintenance/aft) -"cpB" = ( -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "acutesep"; - name = "Acute Separation Privacy Shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/medical/exam_room) "cpC" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, /obj/machinery/disposal{ pixel_x = 5 }, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -56679,6 +56134,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -56926,15 +56382,11 @@ autoclose = 0; frequency = 1449; heat_proof = 1; - icon_state = "door_locked"; id_tag = "gas_turbine_interior"; locked = 1; name = "Incinerator Interior Airlock"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 5 - }, /turf/simulated/floor/engine, /area/maintenance/incinerator) "cqb" = ( @@ -56985,6 +56437,7 @@ name = "Scientist" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57001,7 +56454,6 @@ }, /area/toxins/lab) "cqi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/shower{ dir = 4 }, @@ -57075,8 +56527,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/item/flashlight, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cqr" = ( @@ -57119,7 +56571,7 @@ /obj/machinery/computer/rdconsole/core, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -57244,7 +56696,9 @@ /turf/simulated/floor/engine/n2, /area/atmos) "cqL" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/portable_atmospherics/canister/nitrogen{ + anchored = 1 + }, /turf/simulated/floor/engine/n2, /area/atmos) "cqM" = ( @@ -57262,7 +56716,9 @@ /turf/simulated/floor/engine/o2, /area/atmos) "cqO" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/oxygen{ + anchored = 1 + }, /turf/simulated/floor/engine/o2, /area/atmos) "cqP" = ( @@ -57274,23 +56730,29 @@ /turf/simulated/floor/engine, /area/maintenance/incinerator) "cqQ" = ( -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/engine/air, -/area/atmos) +/obj/structure/lattice, +/obj/machinery/atmospherics/binary/pump/on, +/obj/structure/disposalpipe/segment, +/turf/space, +/area/space/nearstation) "cqR" = ( -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/portable_atmospherics/canister/air{ + anchored = 1 + }, /turf/simulated/floor/engine/air, /area/atmos) "cqS" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - N2"; - dir = 8 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/engine/n2, -/area/atmos) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft) "cqT" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 1 @@ -57378,11 +56840,11 @@ }, /area/maintenance/aft) "crd" = ( -/obj/machinery/sleeper, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/exam_room) +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "crf" = ( /obj/machinery/door/poddoor/shutters{ density = 0; @@ -57391,7 +56853,6 @@ name = "Acute Separation Privacy Shutters"; opacity = 0 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -57422,18 +56883,16 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/reception) "crl" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - O2"; - dir = 8 - }, -/turf/simulated/floor/engine/o2, -/area/atmos) +/obj/effect/spawner/airlock/e_to_w, +/turf/simulated/wall, +/area/maintenance/aft) "crm" = ( /obj/machinery/light{ dir = 1; @@ -57445,12 +56904,18 @@ }, /area/medical/reception) "crq" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics Tank - Air"; - dir = 8 +/obj/machinery/power/apc{ + dir = 8; + name = "Aft Starboard Maintenance APC"; + pixel_x = -26; + pixel_y = 3 }, -/turf/simulated/floor/engine/air, -/area/atmos) +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/aft) "crr" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -57605,7 +57070,6 @@ }, /area/hallway/primary/aft) "crJ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -57620,6 +57084,7 @@ "crK" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57632,7 +57097,6 @@ }, /area/toxins/lab) "crM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -57640,6 +57104,7 @@ /area/toxins/lab) "crN" = ( /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57751,24 +57216,24 @@ }, /area/medical/research) "crY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/medical/research) "crZ" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -57777,9 +57242,6 @@ }, /area/medical/research) "csa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/noticeboard{ pixel_y = -32 }, @@ -57792,6 +57254,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -57894,7 +57359,6 @@ /area/maintenance/aft) "csh" = ( /obj/machinery/door/airlock/maintenance{ - icon_state = "door_closed"; name = "Storage Room"; req_access_txt = "12" }, @@ -57971,11 +57435,11 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cso" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/binary/pump/on, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/manifold/visible/purple, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/maintenance/incinerator) "csp" = ( /obj/item/wrench, /turf/simulated/floor/plating/airless, @@ -58039,7 +57503,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -58214,7 +57677,6 @@ name = "Acute Separation Privacy Shutters"; opacity = 0 }, -/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -58331,7 +57793,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 2; icon_state = "open"; id_tag = "acute1"; name = "Acute 1 Privacy Shutters"; @@ -58374,6 +57835,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -58442,7 +57904,6 @@ }, /area/medical/chemistry) "csY" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ id_tag = ""; @@ -58497,7 +57958,6 @@ /area/medical/research) "ctc" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/research{ id_tag = ""; name = "Research Break Room"; @@ -58505,6 +57965,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -58514,7 +57975,6 @@ /turf/simulated/wall, /area/toxins/explab) "ctf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/shower{ dir = 4 }, @@ -58547,9 +58007,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/item/storage/box/lights/mixed, /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "ctl" = ( @@ -58581,7 +58041,6 @@ autoclose = 0; frequency = 1449; heat_proof = 1; - icon_state = "door_locked"; id_tag = "gas_turbine_exterior"; locked = 1; name = "Incinerator Exterior Airlock"; @@ -58907,10 +58366,6 @@ }, /area/medical/exam_room) "cul" = ( -/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{ @@ -58924,24 +58379,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" }, /area/medical/research) -"cun" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "cuo" = ( /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -58964,7 +58406,6 @@ /area/medical/research) "cuq" = ( /obj/structure/table, -/obj/structure/disposalpipe/segment, /obj/item/folder/white, /obj/item/disk/tech_disk, /obj/item/disk/tech_disk, @@ -59005,9 +58446,9 @@ }, /area/medical/research) "cuu" = ( -/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 = "whitepurple" @@ -59038,9 +58479,9 @@ name = "Science Requests Console"; pixel_y = 30 }, +/obj/effect/decal/warning_stripes/south, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/explab) "cuy" = ( @@ -59264,13 +58705,6 @@ /area/medical/surgery1) "cvc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "open"; - id_tag = "acute2"; - name = "Acute 2 Privacy Shutters"; - opacity = 0 - }, /obj/machinery/door/airlock/medical{ name = "Acute Treatment 2"; req_access_txt = "5" @@ -59314,6 +58748,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59399,10 +58834,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -59419,15 +58850,16 @@ d2 = 8; icon_state = "4-8" }, -/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 = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59438,16 +58870,16 @@ d2 = 8; icon_state = "4-8" }, -/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 = 4; icon_state = "whitepurple" @@ -59509,23 +58941,6 @@ icon_state = "white" }, /area/medical/research) -"cvx" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/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{ - icon_state = "white" - }, -/area/medical/research) "cvy" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -59595,35 +59010,16 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) -"cvD" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59634,9 +59030,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -59646,6 +59039,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59656,19 +59052,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "cvH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -59680,6 +59073,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59695,16 +59091,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -59712,9 +59108,6 @@ /area/medical/research) "cvJ" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -59730,16 +59123,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull" }, /area/toxins/explab) "cvK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -59751,6 +59143,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 = "whitepurple" @@ -59899,10 +59295,7 @@ }, /area/toxins/explab) "cwd" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen"; - opened = 1 - }, +/obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -60142,7 +59535,7 @@ "cwK" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/sink{ dir = 8; @@ -60163,12 +59556,6 @@ icon_state = "white" }, /area/medical/research) -"cwM" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) "cwO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -60179,25 +59566,25 @@ }, /area/medical/research) "cwP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "cwQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60238,9 +59625,9 @@ d2 = 2; icon_state = "1-2" }, -/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 = 6; icon_state = "whitepurple" @@ -60409,11 +59796,11 @@ }, /area/medical/chemistry) "cxB" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60515,9 +59902,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cxL" = ( @@ -60536,7 +59923,6 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; id_tag = "toxins_blastdoor"; @@ -60549,6 +59935,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/toxins/storage) "cxN" = ( @@ -60573,7 +59960,6 @@ /turf/simulated/floor/plasteel, /area/toxins/lab) "cxO" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 5; @@ -60594,8 +59980,8 @@ }, /area/medical/research) "cxQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60636,10 +60022,19 @@ name = "\improper Research Testing Range" }) "cxT" = ( -/turf/simulated/floor/plating/airless, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/aft) "cxU" = ( /turf/simulated/wall, /area/crew_quarters/hor) @@ -60699,8 +60094,8 @@ /turf/simulated/floor/plasteel, /area/toxins/lab) "cya" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/lab) "cyb" = ( @@ -60762,12 +60157,12 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cyk" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ name = "Research Lab Maintenance"; req_access_txt = "7" }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/lab) "cym" = ( @@ -60776,7 +60171,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -60840,10 +60234,6 @@ /turf/simulated/floor/plating, /area/medical/cmo) "cyt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -60854,6 +60244,11 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Chemistry Junction"; + sortType = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60863,42 +60258,41 @@ /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cyv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay3) "cyw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay3) "cyx" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60910,21 +60304,24 @@ name = "Chemistry Lab"; req_access_txt = "5; 33" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) "cyz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60981,11 +60378,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cyM" = ( @@ -60997,12 +60395,12 @@ }, /area/hallway/primary/aft) "cyN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock{ name = "Aft Emergency Storage" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cyO" = ( @@ -61016,12 +60414,12 @@ /turf/simulated/floor/plasteel, /area/toxins/explab) "cyQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "7;47;29;12" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cyR" = ( @@ -61048,18 +60446,18 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cyV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Research Maintenance"; req_one_access_txt = "7;47;29" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/research) "cyW" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61072,13 +60470,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; + name = "RD Junction"; sortType = 13 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61124,9 +60523,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -61155,9 +60551,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -61175,9 +60568,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -61195,7 +60585,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -61236,15 +60626,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgeryobs) "czo" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/chair{ dir = 1 }, @@ -61265,6 +60654,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61424,15 +60817,14 @@ /turf/simulated/wall, /area/medical/genetics) "czD" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61501,17 +60893,6 @@ icon_state = "whitehall" }, /area/medical/research) -"czP" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) "czR" = ( /obj/machinery/door_control{ id = "xeno_blastdoor"; @@ -61576,17 +60957,19 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgeryobs) "czV" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - sortType = 14 - }, /obj/effect/decal/warning_stripes/west, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "czX" = ( @@ -61600,18 +60983,19 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "czY" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/sortjunction{ dir = 8; + name = "Research Junction"; sortType = 12 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft) "czZ" = ( +/obj/effect/decal/warning_stripes/northwest, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plating, /area/maintenance/aft) "cAa" = ( @@ -61702,10 +61086,6 @@ }, /area/medical/medbay3) "cAi" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -61722,10 +61102,6 @@ /obj/item/folder/white{ pixel_y = 2 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - sortType = 23 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellowfull" @@ -61738,26 +61114,12 @@ /obj/effect/landmark/start{ name = "Chemist" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" }, /area/medical/chemistry) -"cAm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/chemistry) "cAn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -61779,18 +61141,12 @@ pixel_x = -3; pixel_y = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellowfull" }, /area/medical/chemistry) "cAp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -61814,9 +61170,9 @@ }, /area/medical/genetics) "cAs" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -61840,16 +61196,6 @@ icon_state = "vault" }, /area/medical/genetics) -"cAv" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" - }, -/area/hallway/primary/aft) "cAw" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -61861,9 +61207,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -61887,30 +61230,27 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, /area/medical/surgeryobs) "cAy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/maintenance/aft) -"cAz" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/aft) +"cAz" = ( /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cAA" = ( @@ -61978,10 +61318,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/storage) "cAI" = ( @@ -62081,6 +61421,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62214,10 +61558,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -62225,6 +61565,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cBl" = ( @@ -62240,14 +61584,14 @@ icon_state = "4-8" }, /obj/structure/chair/stool, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cBo" = ( @@ -62266,39 +61610,18 @@ name = "Chief Medical Officer's Office"; req_access_txt = "40" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) -"cBq" = ( -/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{ - dir = 4; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cBs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) "cBt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Chief Medical Officer" }, @@ -62308,9 +61631,6 @@ }, /area/medical/cmo) "cBu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 8; @@ -62445,7 +61765,6 @@ name = "Mech Bay Maintenance"; req_access_txt = "29" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/assembly/chargebay) "cBL" = ( @@ -62492,16 +61811,16 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62512,15 +61831,15 @@ d2 = 8; icon_state = "4-8" }, -/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 = 4; icon_state = "whiteblue" @@ -62532,9 +61851,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Research Director's Office"; @@ -62546,6 +61862,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -62557,40 +61876,40 @@ d2 = 8; icon_state = "2-8" }, -/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 = 5; icon_state = "cafeteria" }, /area/crew_quarters/hor) "cBT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/crew_quarters/hor) "cBU" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -62599,13 +61918,13 @@ }, /area/crew_quarters/hor) "cBV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -62625,9 +61944,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -62649,12 +61965,10 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cCa" = ( -/obj/machinery/disposal{ - pixel_x = 5 - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -62665,9 +61979,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -62724,16 +62035,16 @@ }, /area/medical/chemistry) "cCh" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/power/apc{ dir = 4; name = "CMO's Office APC"; pixel_x = 26 }, /obj/structure/cable/yellow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -62806,14 +62117,14 @@ }, /area/medical/reception) "cCo" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -62823,10 +62134,6 @@ name = "Station Intercom (General)"; pixel_x = -29 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -62838,9 +62145,12 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, /obj/structure/window/reinforced{ - dir = 5; - max_integrity = 1e+007 + dir = 1 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/medical/surgeryobs) "cCr" = ( @@ -62849,9 +62159,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -62865,16 +62172,19 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/reinforced{ - dir = 5; - max_integrity = 1e+007 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/medical/surgeryobs) "cCt" = ( @@ -62899,6 +62209,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62920,6 +62233,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62941,6 +62257,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62962,6 +62282,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62998,7 +62321,6 @@ }, /area/medical/genetics) "cCE" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -63083,16 +62405,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ 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 = "white" }, @@ -63104,6 +62426,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63177,17 +62503,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/toxins/storage) -"cCU" = ( -/obj/structure/closet/emcloset, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = -32 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cCV" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ @@ -63287,6 +62602,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -63310,6 +62626,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63330,8 +62647,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/disposalpipe/trunk, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -63348,9 +62665,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -63385,7 +62699,6 @@ /turf/simulated/floor/engine/vacuum, /area/space/nearstation) "cDo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, @@ -63402,12 +62715,12 @@ name = "\improper Research Testing Range" }) "cDr" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/status_display{ layer = 4; pixel_y = 32 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, @@ -63459,7 +62772,6 @@ }, /area/medical/medbay3) "cDx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -63486,6 +62798,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cDA" = ( @@ -63502,6 +62815,13 @@ /obj/item/tank/internals/air, /obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = -32 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cDC" = ( @@ -63510,7 +62830,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cDD" = ( @@ -63554,7 +62873,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment, /obj/structure/sign/nosmoking_2{ pixel_x = -28 }, @@ -63577,7 +62895,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -63627,19 +62945,22 @@ "cDO" = ( /obj/structure/bed/dogbed, /mob/living/simple_animal/pet/cat/Runtime, +/obj/machinery/light_switch{ + pixel_y = -25 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) "cDP" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -63649,31 +62970,16 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/storage) -"cDR" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cDS" = ( /obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/reception) "cDT" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -63808,7 +63114,6 @@ }, /area/medical/surgeryobs) "cEk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -63839,6 +63144,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 = "white" }, @@ -63915,9 +63221,9 @@ }, /area/medical/cryo) "cEA" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEB" = ( @@ -63927,6 +63233,10 @@ "cEC" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/fungus, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -63966,18 +63276,18 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cEI" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" }) "cEJ" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEK" = ( @@ -64273,7 +63583,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cFn" = ( @@ -64445,6 +63754,9 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -64605,7 +63917,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -64626,7 +63937,7 @@ "cGi" = ( /obj/structure/table, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light{ dir = 1; @@ -64746,10 +64057,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGu" = ( @@ -64758,9 +64065,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGv" = ( @@ -64774,10 +64078,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/assembly/chargebay) @@ -64928,37 +64228,12 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cGK" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/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 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cGL" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -64976,9 +64251,6 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -64991,17 +64263,6 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cGN" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cGO" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -65033,6 +64294,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -65045,7 +64311,7 @@ dir = 8 }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -65112,7 +64378,6 @@ /turf/simulated/floor/plasteel, /area/medical/cryo) "cGZ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -65125,9 +64390,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cHa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65145,15 +64407,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbreak) "cHb" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -65165,16 +64426,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay3) "cHc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65183,15 +64443,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/medical/medbreak) "cHd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65208,6 +64469,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -65226,6 +64490,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -65243,6 +64510,9 @@ name = "Staff Room"; req_access_txt = "5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65260,6 +64530,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -65295,21 +64568,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) -"cHl" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cHm" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -65346,7 +64612,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -65451,7 +64716,9 @@ pixel_x = -25 }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -65462,7 +64729,9 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -65506,6 +64775,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65526,7 +64796,9 @@ }) "cHK" = ( /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -65608,6 +64880,15 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/power/apc{ + dir = 4; + name = "Toxins Launch Room APC"; + pixel_x = 26 + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -65798,13 +65079,13 @@ name = "Port Maintenance" }) "cIj" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "cIk" = ( @@ -65910,7 +65191,6 @@ name = "Robotics Lab"; req_access_txt = "29" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -66017,6 +65297,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66035,6 +65318,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66050,6 +65336,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66181,7 +65471,6 @@ }, /area/medical/medbay3) "cIW" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -66312,7 +65601,9 @@ pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cJk" = ( /obj/machinery/mecha_part_fabricator, @@ -66324,10 +65615,11 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cJl" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -66336,7 +65628,9 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cJm" = ( /obj/machinery/mecha_part_fabricator, @@ -66345,7 +65639,9 @@ network = list("SS13","RD") }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cJn" = ( /obj/structure/sign/nosmoking_2{ @@ -66359,7 +65655,9 @@ /obj/item/storage/belt/utility, /obj/item/reagent_containers/glass/beaker/large, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cJo" = ( /obj/item/radio/intercom{ @@ -66434,14 +65732,13 @@ }) "cJw" = ( /obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disaster_counter/toxins{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -66519,14 +65816,14 @@ /turf/simulated/floor/plating/airless, /area/toxins/test_area) "cJF" = ( +/obj/effect/decal/warning_stripes/northeast, /obj/machinery/disposal{ pixel_x = -2; pixel_y = -2 }, /obj/structure/disposalpipe/trunk{ - dir = 1 + dir = 4 }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -66588,7 +65885,7 @@ /area/medical/virology) "cJO" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, /turf/simulated/floor/plasteel{ @@ -66616,10 +65913,6 @@ }, /area/medical/patient_b) "cJR" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -66691,7 +65984,9 @@ }, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -66704,7 +65999,9 @@ /obj/structure/table, /obj/structure/cable/yellow, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -66753,6 +66050,9 @@ }, /area/medical/genetics) "cKp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, @@ -66790,7 +66090,9 @@ }, /obj/machinery/light, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) @@ -66989,8 +66291,7 @@ "cKP" = ( /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/plating, /area/medical/virology) @@ -67076,12 +66377,12 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5;39;6" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cKW" = ( @@ -67093,7 +66394,6 @@ /area/medical/medbay3) "cKX" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -67104,7 +66404,7 @@ "cKY" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -67139,7 +66439,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -67160,7 +66460,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -67189,7 +66489,7 @@ "cLg" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Middle"; @@ -67224,15 +66524,6 @@ icon_state = "white" }, /area/medical/surgery2) -"cLk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cLl" = ( /obj/structure/table, /obj/item/crowbar, @@ -67331,10 +66622,6 @@ }, /area/medical/research) "cLv" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -67343,9 +66630,6 @@ }, /area/medical/medbay3) "cLw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -67353,15 +66637,6 @@ }, /area/medical/medbay3) "cLx" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 0; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -67370,7 +66645,6 @@ /obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; @@ -67381,9 +66655,6 @@ name = "\improper Toxins Lab" }) "cLz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -67400,6 +66671,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/northwest, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cLB" = ( @@ -67595,10 +66869,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cLX" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -67609,19 +66879,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) -"cLY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay3) "cLZ" = ( /obj/structure/table, /obj/item/assembly/igniter{ @@ -67699,7 +66961,9 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cMh" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -67729,13 +66993,11 @@ }, /obj/item/stack/cable_coil, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cMm" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -67744,6 +67006,9 @@ /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMn" = ( @@ -67758,7 +67023,9 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/photocopier, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cMp" = ( /obj/structure/cable/yellow{ @@ -67818,10 +67085,6 @@ }, /area/medical/genetics) "cMt" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -67833,6 +67096,10 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/northeast, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMu" = ( @@ -67993,13 +67260,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -68109,7 +67376,6 @@ /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "virology_airlock_interior"; locked = 1; name = "Virology Interior Airlock"; @@ -68147,30 +67413,29 @@ name = "Chief Medical Officer's Office"; req_access_txt = "40" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) "cMQ" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - sortType = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -68186,7 +67451,6 @@ /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Exterior Airlock"; @@ -68257,10 +67521,11 @@ pixel_x = -8; pixel_y = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cMY" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -68329,36 +67594,40 @@ name = "\improper Toxins Lab" }) "cNe" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/machinery/light_switch{ pixel_x = 27 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cNf" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 }, /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cNg" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cNi" = ( @@ -68500,10 +67769,6 @@ }, /area/medical/virology) "cNF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -68514,19 +67779,25 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "CMO's Junction"; + sortType = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cNG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -68611,13 +67882,11 @@ pixel_x = -31 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cNR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -68635,7 +67904,6 @@ }, /area/hallway/primary/aft) "cNU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -68647,6 +67915,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68686,6 +67955,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cNY" = ( @@ -68719,16 +67989,18 @@ /obj/effect/decal/warning_stripes/yellow, /obj/item/storage/firstaid/machine, /obj/item/storage/firstaid/machine, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cNZ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cOa" = ( @@ -68736,16 +68008,16 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cOb" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cOc" = ( @@ -68925,7 +68197,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ @@ -69027,11 +68299,11 @@ }, /area/medical/virology) "cOB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/chair/stool, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreen" }, -/turf/simulated/wall, /area/medical/virology) "cOC" = ( /obj/structure/closet/crate/freezer, @@ -69057,6 +68329,9 @@ /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -69065,7 +68340,7 @@ /obj/structure/closet/wardrobe/virology_white, /obj/item/storage/backpack/satchel_vir, /obj/structure/disposalpipe/segment{ - dir = 8; + dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ @@ -69075,6 +68350,10 @@ "cOE" = ( /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 = "vault" }, @@ -69164,12 +68443,15 @@ }, /area/medical/patient_b) "cOM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/aft) "cON" = ( @@ -69185,6 +68467,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 = "escape" }, @@ -69252,7 +68535,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cOW" = ( /obj/structure/window/reinforced{ @@ -69262,11 +68547,15 @@ /obj/structure/closet/secure_closet/roboticist{ pixel_x = 2 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cOX" = ( /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cOZ" = ( /turf/simulated/floor/plasteel{ @@ -69415,7 +68704,9 @@ pixel_x = 3 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cPp" = ( /obj/item/bedsheet/medical, @@ -69446,10 +68737,6 @@ icon_state = "freezerfloor" }, /area/medical/virology) -"cPs" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall, -/area/medical/virology) "cPt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -69458,6 +68745,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 = "whitegreenfull" }, @@ -69498,7 +68786,6 @@ }, /area/medical/virology) "cPA" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -69507,6 +68794,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69657,6 +68945,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -69745,7 +69034,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cPW" = ( /obj/machinery/door/window/eastleft{ @@ -69754,7 +69045,9 @@ req_access_txt = "29" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cPX" = ( /obj/structure/sink{ @@ -69896,10 +69189,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -69988,6 +69277,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -70001,7 +69291,7 @@ /obj/item/hand_labeler, /obj/item/radio/headset/headset_med, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Virology - Cells"; @@ -70047,19 +69337,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) -"cQy" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cQz" = ( /obj/machinery/power/apc{ dir = 8; @@ -70211,7 +69488,9 @@ pixel_y = 4 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "cQP" = ( /obj/machinery/door/airlock/maintenance{ @@ -70274,18 +69553,6 @@ /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/maintenance/aft) -"cQV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cQW" = ( /turf/simulated/wall/r_wall, /area/maintenance/starboardsolar) @@ -70344,6 +69611,7 @@ /area/medical/virology) "cRe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70384,7 +69652,6 @@ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; req_access_txt = "27" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -70392,13 +69659,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cRl" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -70407,26 +69671,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft) -"cRm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "cRn" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -70443,6 +69693,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -70453,6 +69707,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -70494,29 +69751,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cRw" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -70574,6 +69808,10 @@ /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -70784,7 +70022,7 @@ }, /area/medical/medbay3) "cRW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -70834,11 +70072,11 @@ }, /area/chapel/office) "cSc" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -70851,22 +70089,18 @@ departmentType = 2; pixel_y = 30 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/office) "cSe" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -70876,6 +70110,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -70898,7 +70136,6 @@ }, /area/chapel/office) "cSh" = ( -/obj/structure/table/wood, /obj/item/spellbook/oneuse/smoke{ name = "mysterious old book of " }, @@ -70925,7 +70162,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cSj" = ( @@ -70939,7 +70175,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cSk" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -70947,11 +70182,6 @@ name = "\improper Departure Lounge" }) "cSl" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - sortType = 17 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -70964,6 +70194,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "cSn" = ( @@ -70977,10 +70208,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -70997,10 +70224,6 @@ name = "\improper Departure Lounge" }) "cSq" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -71123,6 +70346,9 @@ /obj/machinery/atmospherics/unary/tank/air{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -71133,6 +70359,9 @@ name = "virology air connector port" }, /obj/machinery/portable_atmospherics/canister/air, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -71140,6 +70369,10 @@ "cSF" = ( /obj/item/trash/popcorn, /obj/structure/table/glass, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -71203,7 +70436,7 @@ "cSN" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -71243,7 +70476,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -71417,10 +70649,6 @@ }, /area/medical/virology) "cTg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10-Aft-To-Central"; location = "9.4-Escape-4" @@ -71593,6 +70821,9 @@ name = "Robotics Desk"; req_access_txt = "29" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/assembly/robotics) "cTx" = ( @@ -71634,8 +70865,8 @@ }, /area/chapel/office) "cTB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -71693,10 +70924,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -71706,9 +70933,6 @@ /turf/simulated/floor/carpet, /area/chapel/main) "cTK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -71723,9 +70947,6 @@ name = "Chapel"; opacity = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -71752,28 +70973,10 @@ }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cTP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cTQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -71790,8 +70993,10 @@ /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, /obj/structure/window/reinforced{ - dir = 5; - max_integrity = 1e+007 + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/simulated/floor/grass, /area/hallway/secondary/exit{ @@ -71889,6 +71094,9 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/medbay3) "cUb" = ( @@ -71922,10 +71130,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cUe" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -71943,6 +71147,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71967,7 +71175,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -72035,9 +71243,6 @@ }, /area/chapel/office) "cUp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -72047,14 +71252,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cUq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -72066,14 +71271,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cUr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -72086,6 +71291,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72217,9 +71425,6 @@ name = "\improper Departure Lounge" }) "cUF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -72227,6 +71432,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72264,10 +71472,6 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "cUN" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -72333,15 +71537,15 @@ }, /area/chapel/office) "cUV" = ( -/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 = 4; icon_state = "whiteblue" @@ -72373,15 +71577,15 @@ }, /area/chapel/main) "cVb" = ( -/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 = "dark" }, @@ -72405,8 +71609,10 @@ /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/window/reinforced{ - dir = 5; - max_integrity = 1e+007 + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/simulated/floor/grass, /area/hallway/secondary/exit{ @@ -72447,15 +71653,15 @@ }) "cVl" = ( /obj/structure/morgue, -/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 = "dark" }, @@ -72464,13 +71670,13 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72515,9 +71721,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cVs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -72530,10 +71733,6 @@ name = "\improper Departure Lounge" }) "cVu" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -72545,6 +71744,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72556,6 +71758,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72591,9 +71797,6 @@ name = "\improper Departure Lounge" }) "cVD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -72660,13 +71863,10 @@ name = "memorial board"; pixel_y = 32 }, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/fancy/candle_box{ - pixel_x = -2; - pixel_y = 2 - }, /obj/effect/decal/cleanable/cobweb, /obj/structure/table/wood, +/obj/item/storage/fancy/candle_box/eternal, +/obj/item/storage/fancy/candle_box/eternal, /turf/simulated/floor/carpet, /area/chapel/main) "cVO" = ( @@ -72845,6 +72045,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cWm" = ( @@ -73006,6 +72210,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -73359,7 +72566,6 @@ /obj/machinery/door/airlock/research{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "xeno_airlock_interior"; locked = 1; name = "Secure Lab Internal Airlock"; @@ -73460,13 +72666,13 @@ /obj/effect/landmark/start{ name = "Civilian" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -73474,7 +72680,7 @@ "cXE" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -73700,9 +72906,9 @@ /obj/structure/window/reinforced{ dir = 1 }, -/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 = "dark" }, @@ -73710,7 +72916,6 @@ name = "\improper Recreation Area" }) "cYa" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -73719,15 +72924,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" }, /area/medical/cmo) "cYb" = ( -/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 = 5; icon_state = "vault" @@ -73745,9 +72951,9 @@ }) "cYe" = ( /obj/structure/window/reinforced, -/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 = "dark" }, @@ -73876,11 +73082,11 @@ /obj/structure/chair{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -73895,13 +73101,16 @@ codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers"; location = "14.5-Recreation" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -73946,20 +73155,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "cYI" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -73980,9 +73185,9 @@ "cYL" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -74085,7 +73290,6 @@ name = "Morgue Maintenance"; req_access_txt = "6" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -74214,12 +73418,12 @@ d2 = 2; icon_state = "1-2" }, +/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/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -74236,12 +73440,12 @@ /turf/space, /area/space) "cZq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -74256,7 +73460,7 @@ /obj/structure/closet/secure_closet/chaplain, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -74334,9 +73538,9 @@ /obj/machinery/door/airlock/public/glass{ name = "Arcade" }, -/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/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -74506,7 +73710,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -74724,7 +73928,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -74738,6 +73941,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -75049,12 +74253,12 @@ /obj/structure/sign/biohazard{ pixel_x = -32 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -75309,7 +74513,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/gps, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/chapel/main) @@ -75666,7 +74869,7 @@ }, /obj/machinery/disposal, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -76066,19 +75269,9 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;5;39;6" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) -"deh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/wall, -/area/maintenance/aft) "dei" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -76095,9 +75288,6 @@ name = "\improper Secure Lab" }) "dek" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -76156,7 +75346,7 @@ "der" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; - req_access_txt = "5" + req_access_txt = "64" }, /obj/structure/cable/yellow{ d1 = 1; @@ -76190,10 +75380,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"deu" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall/r_wall, -/area/medical/virology) "dez" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -76226,7 +75412,16 @@ name = "\improper Secure Lab" }) "deC" = ( -/obj/machinery/computer/security, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/pen, +/obj/machinery/camera{ + c_tag = "Engineering Equipment East"; + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -76272,11 +75467,9 @@ /turf/simulated/wall, /area/maintenance/maintcentral) "deG" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Security Pod Pilot" +/obj/structure/table/reinforced, +/obj/item/spacepod_key{ + id = 100000 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -76363,6 +75556,17 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -76709,7 +75913,7 @@ "dfK" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -76980,11 +76184,21 @@ name = "Arrivals" }) "dgu" = ( -/obj/effect/decal/warning_stripes/south, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" }) "dgv" = ( /obj/effect/decal/warning_stripes/south, @@ -77056,9 +76270,6 @@ name = "Arrivals" }) "dgE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77073,6 +76284,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "dgG" = ( @@ -77108,7 +76322,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/engine, /area/hallway/secondary/entry{ @@ -77139,9 +76353,6 @@ name = "\improper Secure Lab" }) "dhf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -77212,16 +76423,13 @@ /turf/space, /area/chapel/main) "dhq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/aft) "dhr" = ( @@ -77230,10 +76438,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77375,6 +76579,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77483,11 +76690,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sol_inner"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -77540,15 +76745,15 @@ }, /area/medical/research) "dFD" = ( -/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/plating, /area/maintenance/fore) "dGT" = ( @@ -77568,9 +76773,6 @@ name = "\improper Departure Lounge" }) "dHr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77582,6 +76784,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "dKL" = ( @@ -77636,13 +76841,13 @@ d2 = 2; icon_state = "1-2" }, -/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, /area/hallway/primary/aft) "dTK" = ( @@ -77686,16 +76891,17 @@ /turf/simulated/floor/engine, /area/engine/engineering) "dYi" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/engine/gravitygenerator) "dZe" = ( @@ -77706,7 +76912,6 @@ }, /area/medical/cryo) "dZM" = ( -/obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -77720,6 +76925,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/cmo) "ebA" = ( @@ -77758,9 +76964,6 @@ /turf/simulated/floor/engine, /area/engine/supermatter) "edg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -78047,7 +77250,6 @@ }, /area/hallway/primary/starboard) "fhH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -78059,6 +77261,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/brig) "fhW" = ( @@ -78117,15 +77320,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) -"frX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "fsY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -78272,6 +77466,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "fWW" = ( @@ -78327,9 +77522,6 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/server) "gaa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -78352,7 +77544,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -78362,7 +77553,6 @@ }, /area/hallway/primary/starboard) "gdd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -78425,9 +77615,6 @@ /turf/simulated/floor/engine, /area/engine/engineering) "gip" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -78439,6 +77626,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "gkU" = ( @@ -78468,12 +77658,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "gnZ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -78505,6 +77697,12 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"gtu" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/reception) "gwJ" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, @@ -78559,6 +77757,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "gKb" = ( @@ -78573,9 +77772,6 @@ }, /area/security/brig) "gMS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -78607,10 +77803,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "gQu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -78696,6 +77892,17 @@ icon_state = "dark" }, /area/engine/engineering) +"hgW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "hht" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -78820,6 +78027,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -79016,11 +78226,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/landmark/start{ + name = "Shaft Miner" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -79086,6 +78299,17 @@ }, /turf/space, /area/space) +"idx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/bluegrid, +/area/maintenance/aft) "ied" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -79160,6 +78384,12 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"ikO" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/assembly/robotics) "ilf" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -79211,9 +78441,6 @@ }, /area/hallway/primary/port) "iof" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -79221,8 +78448,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) +"isf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "iuh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -79367,13 +78604,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -79392,7 +78629,7 @@ "iWv" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) @@ -79471,7 +78708,6 @@ name = "\improper Secure Lab" }) "jlB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -79501,16 +78737,6 @@ icon_state = "bluecorner" }, /area/hallway/primary/aft) -"jzm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "jCi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -79564,6 +78790,9 @@ }, /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 = "red" }, @@ -79593,16 +78822,16 @@ /area/turret_protected/ai) "jPv" = ( /obj/effect/decal/warning_stripes/north, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "jQZ" = ( @@ -79660,7 +78889,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -79775,9 +79003,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -79788,9 +79013,6 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/server) "kxf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -79799,6 +79021,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "kzH" = ( @@ -80064,19 +79289,18 @@ d2 = 8; icon_state = "4-8" }, -/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, /area/security/brig) "lid" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -80125,7 +79349,6 @@ name = "Port Maintenance" }) "lBy" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -80160,6 +79383,9 @@ "lFH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -80232,18 +79458,13 @@ name = "Arrivals" }) "lSh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 5; - max_integrity = 120; - reinf = 0 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/construction{ name = "\improper Garden" @@ -80270,15 +79491,6 @@ }, /turf/simulated/floor/plasteel, /area/security/brig) -"mcn" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "mcP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -80303,11 +79515,9 @@ "mea" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sol_outer"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -80407,14 +79617,10 @@ name = "\improper MiniSat Exterior" }) "msg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/podbay) +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/fore) "myY" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -80469,6 +79675,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "mFx" = ( @@ -80483,17 +79693,6 @@ icon_state = "whitebluecorner" }, /area/medical/medbay3) -"mGz" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "mGK" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -80545,6 +79744,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -80674,9 +79874,6 @@ /area/crew_quarters/theatre) "nig" = ( /obj/effect/decal/warning_stripes/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "niH" = ( @@ -80815,7 +80012,6 @@ /turf/simulated/floor/wood, /area/ntrep) "nLH" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -80843,17 +80039,24 @@ icon_state = "dark" }, /area/engine/engineering) +"nTF" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft) "nUW" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "nVg" = ( @@ -80911,15 +80114,12 @@ /turf/simulated/floor/carpet, /area/security/vacantoffice) "ofz" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "ogE" = ( @@ -81014,7 +80214,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -81108,7 +80307,6 @@ /obj/machinery/door/airlock/research{ autoclose = 0; frequency = 1449; - icon_state = "door_locked"; id_tag = "xeno_airlock_exterior"; locked = 1; name = "Secure Lab External Airlock"; @@ -81186,6 +80384,17 @@ }, /turf/simulated/floor/plasteel, /area/atmos) +"phx" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "cmoprivacy"; + name = "privacy shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/medical/cmo) "pjn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -81193,15 +80402,15 @@ }, /area/engine/gravitygenerator) "pkf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "pkq" = ( @@ -81494,6 +80703,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81531,15 +80743,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/toxins/explab) -"qaM" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "qbl" = ( /obj/effect/spawner/airlock, /turf/simulated/wall, @@ -81565,7 +80768,6 @@ /turf/simulated/floor/plating, /area/construction) "qee" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -81573,6 +80775,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Chapel Junction"; + sortType = 17 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81583,11 +80791,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -81613,9 +80821,9 @@ d2 = 2; icon_state = "1-2" }, -/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 = "white" }, @@ -81671,7 +80879,7 @@ "qxn" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -81724,6 +80932,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/landmark/start{ + name = "Shaft Miner" + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -81756,9 +80967,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -81769,9 +80977,6 @@ }, /area/security/main) "qQy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -81779,6 +80984,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "qSf" = ( @@ -81817,6 +81025,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -81831,7 +81042,6 @@ /area/engine/engineering) "rdz" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-06"; level = 4.1 }, /obj/effect/decal/warning_stripes/northwest, @@ -82081,6 +81291,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "rFa" = ( @@ -82230,9 +81441,6 @@ /turf/space, /area/space) "rUJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -82372,6 +81580,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/library) +"srJ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/aft) "ssZ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -82382,9 +81599,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "svF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -82415,19 +81629,15 @@ /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plating, /area/security/brig) "sBY" = ( /turf/simulated/floor/plating, /area/storage/secure) -"sDC" = ( -/obj/docking_port/stationary/whiteship{ - dir = 8; - id = "whiteship_cerebron"; - name = "North of Cerebron" - }, -/turf/space, -/area/space) "sFz" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -82535,13 +81745,17 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "tca" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Quartermaster Junction"; + sortType = 3 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "teE" = ( @@ -82668,15 +81882,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"twD" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "tAk" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -82714,6 +81919,10 @@ /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plating, /area/security/main) "tEL" = ( @@ -82727,11 +81936,12 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "tFb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /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 = "neutralcorner" }, @@ -82756,9 +81966,9 @@ d2 = 2; icon_state = "1-2" }, -/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, /area/hallway/primary/aft) "tSj" = ( @@ -82804,16 +82014,6 @@ /obj/effect/spawner/airlock/e_to_w, /turf/simulated/floor/plating, /area/maintenance/aft) -"tYS" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/aft) "tYX" = ( /obj/machinery/door/poddoor{ density = 0; @@ -82974,6 +82174,7 @@ /area/maintenance/aft) "uBN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "uDi" = ( @@ -83034,6 +82235,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83501,7 +82703,6 @@ /obj/effect/landmark/start{ name = "Cargo Technician" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -83602,6 +82803,19 @@ /area/crew_quarters/fitness{ name = "\improper Arcade" }) +"wAn" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + density = 0; + icon_state = "open"; + id_tag = "acute1"; + name = "Acute 1 Privacy Shutters"; + opacity = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/exam_room) "wAP" = ( /obj/structure/transit_tube{ icon_state = "D-SW" @@ -83640,13 +82854,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /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, /area/hallway/primary/aft) "wHZ" = ( @@ -83725,8 +82939,15 @@ name = "Medbay Storage" }) "xbe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83737,9 +82958,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -83747,6 +82965,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -83817,13 +83038,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "xxA" = ( @@ -83888,6 +83109,19 @@ }, /turf/simulated/floor/plasteel, /area/engine/engineering) +"xJB" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft) "xLf" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -83924,13 +83158,13 @@ }, /area/chapel/main) "xXW" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94976,7 +94210,7 @@ aUN baJ bTH aWD -dgi +cdG bBt dgx dgz @@ -95492,7 +94726,7 @@ bUW aWD dgk bBt -dgu +dgx dgz dgz dgz @@ -97290,7 +96524,7 @@ bRy bTm apf bLK -rvu +dgu apf bZP bZS @@ -98314,12 +97548,12 @@ anE apf aqB apd -apd +bFX apd apd bWi cgo -rvu +dgu bZS bZS bZS @@ -99093,8 +98327,8 @@ ayB rvu apf apd -aEj -cdG +bFX +apd apf aaa aaa @@ -99868,7 +99102,7 @@ dan ceN chP ceN -ceN +xJB ckv ceN cof @@ -99886,8 +99120,8 @@ bZU cFR bZU bZU -clJ -bZU +bgZ +crl bZU aaa abq @@ -100141,8 +99375,8 @@ chy cyU bZU cFS +chy bZU -cCU cEL cDB bZU @@ -100353,8 +99587,8 @@ bgB azQ biC boc -bme -boe +aYk +aYt bpH brE bts @@ -100375,7 +99609,7 @@ bFp bFp bFp apf -avU +hgW bZU cbs cuV @@ -100400,7 +99634,7 @@ bZU cFR bZU bZU -cDR +bgZ bZU bZU cPG @@ -100607,10 +99841,10 @@ aZt aZt aZt bfo -bhc +bfw biD bku -bmf +biD bfw btL brF @@ -100656,8 +99890,8 @@ bZU bZU bZU bZU -cct -cEL +cOx +cqS cdN bZU cNa @@ -100673,11 +99907,11 @@ cKM cFv cME cFv -cOB -cPs -cPs -cPs -deu +cKM +cKM +cKM +cKM +cHZ cKP cHZ abq @@ -100845,7 +100079,7 @@ apf aCs aFE aEM -aEM +aCw aHr aIN aNg @@ -100872,7 +100106,7 @@ bfw bfw bfw btu -bvH +bVW bxS bfG bBK @@ -100896,7 +100130,7 @@ ceE chy cEB cfU -ceE +nTF clu bZU ebA @@ -100915,7 +100149,7 @@ cDk cuV cuV bgZ -chy +clP bZU cNb cJy @@ -101129,7 +100363,7 @@ brH bpJ brG btv -bvH +bVW bxT bzG bBK @@ -101167,10 +100401,10 @@ cod cym cym cAw -tYS +cPj cDj -cjl -cjl +ckJ +ckJ cGg cJR bZU @@ -101386,7 +100620,7 @@ brK bpK aXi btv -bvH +bVW bxT bzH bBK @@ -101401,7 +100635,7 @@ bBK bRG apd atj -apd +crd apf avU bZU @@ -101413,7 +100647,7 @@ bZU ckH cEL bZU -cog +bgZ coD cFQ cLU @@ -101430,11 +100664,11 @@ cFT ckD cIb cDT -cOM +ckJ cGZ -cOM -cOM -cOM +ckJ +ckJ +ckJ cJR bZU aaa @@ -101448,7 +100682,7 @@ cOE cPt cQs cRe -cYM +cOB cSF cHZ aaa @@ -101608,10 +100842,10 @@ aqq arE aug aoX -twD -frX -jap -jap +axn +axn +apd +apd azO aCt aDx @@ -101643,7 +100877,7 @@ boh bpL buu btv -bvH +bVW bxT bzH bBK @@ -101670,7 +100904,7 @@ bZU bib bgZ bZU -cog +srJ coC coC coC @@ -101692,7 +100926,7 @@ cEY cEY cEY cEY -cog +bgZ bZU aaa cFv @@ -101869,7 +101103,7 @@ avY axn aoX aoX -avU +aOx aCs aDy aEQ @@ -101900,7 +101134,7 @@ boh bpM aXi btv -bvH +bVW bBp bfG bBK @@ -101927,7 +101161,7 @@ cjs ckJ clT bZU -cog +bgZ coC cpU crG @@ -101949,7 +101183,7 @@ cKz cLh cMW cEY -cog +bgZ bZU aaa cHZ @@ -102122,11 +101356,11 @@ aqk atd akt auz -avX -axn -cgo -cgo -avU +aGN +aNn +aHY +aHY +aOW aCs aCs aFO @@ -102157,7 +101391,7 @@ boh bpN bfw btz -bvH +bVW bxX apf arK @@ -102184,7 +101418,7 @@ cjr chy ckA bZU -clj +bgZ coC coy crE @@ -102206,7 +101440,7 @@ cGo cGo cMV cEY -cog +bgZ bZU abq cHZ @@ -102379,11 +101613,11 @@ akt akt akt apf -apd axn +apd aoX aoX -avU +aOx aCu aDz aFQ @@ -102421,12 +101655,12 @@ bXI bDL bgY bgY -bgY +bAo bgY aSM bgY bgY -bgY +bAo bgY bgY bgY @@ -102436,12 +101670,12 @@ apf chn apf ceV -cfV +idx dgG cuV clU bZU -clj +bgZ coC cpW crH @@ -102463,7 +101697,7 @@ cKD cLi cNc cEY -cog +bgZ bZU aaa aaa @@ -102659,11 +101893,11 @@ aYh aOu bas aOu -tca +aWV bcv beb bfv -bhc +aXz bmd bfw bmn @@ -102688,7 +101922,7 @@ bTr aoX bWo cgm -cgo +isf apf apf apf @@ -102698,7 +101932,7 @@ cju cjk bZU bZU -clj +bgZ coC cpV tSj @@ -102720,7 +101954,7 @@ cKA dxa cKL cEY -clj +bgZ bZU abq aaa @@ -102907,14 +102141,14 @@ clW aCu aLS aMZ -aOW -aOu +aRo +aRo aSz -beb -mGz -aOu -aOu -aYk +aRo +aVa +aRo +aRo +aYl iZz baV bdZ @@ -102955,7 +102189,7 @@ bZU bZU bZU bZU -clo +hLt coC cpY crE @@ -102977,7 +102211,7 @@ cGo cGo cNs cEY -cog +bgZ bZU abq abq @@ -103169,13 +102403,13 @@ aQG aQG aUd aVa -aOu +aRo aWM aYl -aOu -tca -qaM -bfp +aRo +nYP +bdZ +nig bhX bkx bnq @@ -103206,13 +102440,13 @@ bZW bFw bzK cho -cfX +cQL ceZ chw -chA -cjl -ckC -coh +ckJ +ckJ +cGZ +clT coC cpX crV @@ -103234,7 +102468,7 @@ cKH cLj cNi cEY -cog +bgZ bZU abq aaa @@ -103435,14 +102669,14 @@ bgz bee biP bhe -biK +bkA bkA bmq bon bpR aXi btv -bvH +bVW bxT bai bBP @@ -103462,11 +102696,11 @@ jrE bZc bZZ bzK -ccA +avU chz bZU cfY -ciw +cem ciK cmX cmX @@ -103491,7 +102725,7 @@ cEY cEY cEY cEY -cQV +tfV bZU aaa aaa @@ -103666,9 +102900,9 @@ apb aGl ajg axs -ayG +alW aMc -aNn +caj aCu aCu aCu @@ -103677,13 +102911,13 @@ aCu aCu aCu aNa -aOx +hDK apf aPR apf aLK aTW -aVl +aLK aVl bfw bfw @@ -103692,14 +102926,14 @@ bfw bfw bfw bkK -biL +boh bkB bmr boh bpS brJ btv -bvH +bVW bxT bzM bBQ @@ -103719,7 +102953,7 @@ bXN cgv caa bzK -ccA +avU chx bZU bZU @@ -103739,16 +102973,16 @@ czv cYO cCx mRP -cxp +bSw cDc -cxp +bSC cIV cxp cKW cxp cNI cPy -cog +bgZ bZU bZU cHZ @@ -103925,13 +103159,13 @@ ajg axt aAY iip -aBa -aCw -aCw +aAY +aAY +aAY bMC bMC -aCw -aCw +aAY +aAY aKi aMH aOf @@ -103949,13 +103183,13 @@ bbP bfw bjf bhg -biM -bkC +boh +boh bms -bkC +boh bpT -blx -btC +aXi +btv bvO byb bzN @@ -103976,7 +103210,7 @@ ehr bZe cab bzK -ccA +avU aoX bZU cfZ @@ -103985,7 +103219,7 @@ cdN cmX cok cpb -crd +cpb csG cua djx @@ -103993,7 +103227,7 @@ dio cxr uQo cxy -cBq +cxy cCE cDx cEk @@ -104005,7 +103239,7 @@ cKX cLv cNK cPy -cog +bgZ coD cWI cHZ @@ -104213,7 +103447,7 @@ bss btR bfw btv -bvH +bVW bxT bai bBS @@ -104233,7 +103467,7 @@ esf bHr bHr bzK -ccA +avU auy bZU cga @@ -104249,7 +103483,7 @@ cvd cwj cxt csJ -cys +phx cBp dZM csJ @@ -104259,10 +103493,10 @@ cHa cFd cKe cFd -cLk +cwj cNJ cPy -cog +bgZ cuV chy cHZ @@ -104470,7 +103704,7 @@ bfw bfw bfw bwb -bvH +bVW byc bzK bzK @@ -104490,7 +103724,7 @@ dDw bZf tNG bzK -chp +cEg auJ bZU cgb @@ -104498,10 +103732,10 @@ cmJ cjo cmX cmX -cpB +crf crf csI -cpB +crf cmX cwj cxt @@ -104516,7 +103750,7 @@ cHd cIY cIA cFd -cLk +cwj cNM bSD cLz @@ -104727,7 +103961,7 @@ brX bsi aAM bkG -bvH +bVW byd bzK bBT @@ -104747,7 +103981,7 @@ bYv bZg cac bzK -ccA +avU auC bZU chB @@ -104776,7 +104010,7 @@ cFd cLw cNL cPy -clj +bgZ chy chy cHZ @@ -104984,7 +104218,7 @@ bhl bpW brL btF -bvH +bVW bxT bzK bDw @@ -105004,7 +104238,7 @@ bzK bzK cad bzK -ccA +avU cdT cdT ceQ @@ -105013,7 +104247,7 @@ cdT cmX cok cpb -crd +cpb csN rJk imZ @@ -105030,18 +104264,18 @@ cHg cJa cKj cKe -cLk +cwj cNM cPy -clj +bgZ coD chy bZU cZv day cZv -deh -cQy +bZU +cQx bZU cSd cSL @@ -105228,8 +104462,8 @@ aVk aVq bgY aYX -bgY -bgY +axq +axq azB apf bfD @@ -105237,7 +104471,7 @@ bhl bhl bhl bmw -bhl +aZw bpX brM btG @@ -105264,7 +104498,7 @@ axq ccB cdT cfa -cge +chI chI ciP cmX @@ -105287,7 +104521,7 @@ cHg cIZ cIB cFd -jzm +gSK wEZ cPy cRl @@ -105498,7 +104732,7 @@ bos btS aAM btF -bvR +bVW bxT bzK bBT @@ -105518,16 +104752,16 @@ bXR bzK ayB aoX -bdq +bqQ cdT chT -cgf +cjt oRr clY cmX cmX cmX -cri +wAn csP cmX cmX @@ -105544,11 +104778,11 @@ cHi cGm cKk cFd -cLk +cwj cNM cPy cRo -chy +cyE chy bZU cZw @@ -105744,7 +104978,7 @@ ban aYq bbV aOA -bdq +bgB apf ceY bhn @@ -105755,7 +104989,7 @@ bot bpZ aAM btv -bvR +bVW bxT bzK bDw @@ -105778,7 +105012,7 @@ apf ccC cdT cfs -cgf +cjt chK clX ckF @@ -105801,7 +105035,7 @@ cHh cFd cKe cFd -cLk +cwj cKQ cPy cPy @@ -105998,7 +105232,7 @@ aRu aRu aRu aWT -aYr +aRV aZC aOA bcH @@ -106035,7 +105269,7 @@ cbx ccD cdT chU -cgf +cjt cjt cjt cjt @@ -106054,15 +105288,15 @@ ekd cpH cCH cIV -cHl +cNG cxp cxp cKY -cLY +cYO mFx cKW cRp -cxp +bXQ cxp cYO cZI @@ -106254,8 +105488,8 @@ aRu aRu hBM aRu -aWT -aYr +aRu +aWU aZD avx bcI @@ -106269,7 +105503,7 @@ bkI bQF bNp bNp -bek +bhc bfV bfV bfV @@ -106287,8 +105521,8 @@ bjm bfV bsV bZh -bfV -bfV +bnl +bnm ccE cdT cfz @@ -106300,7 +105534,7 @@ cjA cpD crj csQ -ckd +bIh cvh cDe cDe @@ -106308,13 +105542,13 @@ cyt czD cNF uMx -cFj +bNx cEl -cFj +bNx cHk -cFj -cFj -cFj +bNx +bNx +bNx cLX cNU cPA @@ -106511,20 +105745,20 @@ aUg aUg atJ bmK -aWU +aUg aYs aZE pvu bcJ bei -bfI -bfI -biW -bfI +mOc +mOc +mOc +mOc oJQ -bfI -bjn -bfI +mOc +bcK +mOc btK bvU byh @@ -106532,7 +105766,7 @@ bzQ bfI bfI bfI -oJQ +bOV bJc bKL bfI @@ -106540,10 +105774,10 @@ bfI bfI bfI bfI -bjn +bQG bfI bfI -oJQ +bOV caC cby ccF @@ -106768,23 +106002,23 @@ aRu aRu bmJ aVt -aWV -aYt +aRu +aYr aZF -ayP -bcK -bej +avx +bNp +bek bfJ bhp biX -bdb +bhp bpI -bdb -bqb +bhp +bej brO -bdb -bdb -bdb +bhp +bhp +biK bzR bdb bdb @@ -106803,7 +106037,7 @@ bXT oWL bMR bek -bfV +bnl chM chM cel @@ -107589,8 +106823,8 @@ crW cmj cnq hCM +bLH cpZ -cAm cAF cDf cDm @@ -107802,7 +107036,7 @@ aOF aOF bQF ben -bfM +bqb bhq bja bkM @@ -108104,7 +107338,7 @@ cvj cui hCM cpZ -cAm +cpZ cBd cDf dbl @@ -108125,7 +107359,7 @@ dak dbf deq cRU -cRm +dVK bZU cST rUJ @@ -108375,14 +107609,14 @@ cIm cIm cIm cIm -bSY +bSZ cIm cRU cRU cRU cRU cRU -cRm +dVK bZU cSU cTK @@ -108481,7 +107715,7 @@ aaa aaa aaa aaa -aaa +agD aaa aaa aaa @@ -108636,9 +107870,9 @@ cVb cnE cIm cNR -cOM -cOM -cOM +ckJ +ckJ +ckJ cSq bZU cSO @@ -108787,7 +108021,7 @@ afB agx acN ahP -aiH +aiB ajf ajT akG @@ -108830,9 +108064,9 @@ aZL aZL bdF bep -bfQ +ccP bhu -bmO +bQg bkQ bpU boz @@ -108892,7 +108126,7 @@ cIo cnc cpJ cIm -clj +bgZ bZU bZU bZU @@ -109059,10 +108293,10 @@ qiC ats qiC awt -atq -atq -atq -atq +ayR +ayR +ayR +ayR ayR aAb rDS @@ -109149,7 +108383,7 @@ cmu cVm col cIm -clj +bgZ bZU cPH cSN @@ -109389,7 +108623,7 @@ coo coo cxE cmq -aac +cmq cCl cDh cBv @@ -109406,14 +108640,14 @@ cIo cVl cIn cIm -clo +hLt bZU cPI cQM pue cRt cVc -cTP +pue cRt cRt nej @@ -109646,7 +108880,7 @@ cuF coo cxH cyI -aac +cmq cCl czC cAq @@ -109903,8 +109137,8 @@ cvM cia cxG cmq -aac -cnn +cmq +gtu czC cCi cBA @@ -110181,7 +109415,7 @@ bgZ bZU cSc cRn -cRw +cRx cTs cTW cTW @@ -110432,12 +109666,12 @@ cIn cIn cna pUh -cos +cQA cIm bgZ bZU cPL -cQM +bYy cRx cTr cUz @@ -110694,7 +109928,7 @@ cIm clu bZU cPM -cQM +bYy cRx cTt cUv @@ -110846,7 +110080,7 @@ ahU aiM ajK ajZ -agA +aiH akL alU aln @@ -111188,7 +110422,7 @@ ctQ cgw cgw cgw -cAv +cjH cCp czF cns @@ -111208,7 +110442,7 @@ cNS cNW cON cPN -cQM +bYy cRx cRt nej @@ -111375,7 +110609,7 @@ crz awz aqJ aFz -amE +alM aqJ lgv jZd @@ -111403,7 +110637,7 @@ bes bfU aYx abq -aCV +bmf bqd boF bqi @@ -111448,20 +110682,20 @@ tPc cxK cyL rEw -cgx -cgx -cgx +tPc +tPc +tPc cDz -cgx -cgx -cgx +tPc +tPc +tPc rEw -cgx -cgx -cgx +tPc +tPc +bUu cWl cDz -cgx +tPc cNX cOO cPO @@ -111622,15 +110856,15 @@ aks alY anO tCC -dKL +atB api aqP -dKL +aBa atw auZ atv fhH -arY +aEg aFB ayw aOY @@ -111691,7 +110925,7 @@ cee cfq cgy cgy -cgy +bCz cgy cmm cnu @@ -111715,7 +110949,7 @@ cmm czH cIt cuc -cuc +bXi cWH lHZ cmm @@ -111948,7 +111182,7 @@ ced cfr cft cib -cib +bCG cOm cmn cmo @@ -112205,7 +111439,7 @@ cee cOm cgz cic -cic +bGl bXF cmo coH @@ -112431,7 +111665,7 @@ bek bfV aYx abq -aBY +boe bqj boG mAa @@ -112688,7 +111922,7 @@ bek bfV aYx abq -aBY +boe bql bsc btZ @@ -112921,7 +112155,7 @@ aKc aBl lgv aFA -amE +alM aDU aGr amx @@ -112980,7 +112214,7 @@ cie ckZ cmo cng -coJ +cpd cpd crM cuq @@ -113178,7 +112412,7 @@ amx alF lgv vDc -amE +amL aDX aFo fZC @@ -113231,7 +112465,7 @@ cbG ccP ceh cfv -czP +rZk cig cjL cla @@ -113485,7 +112719,7 @@ bYD bNh cay bek -bfK +bdb cee cOm cgE @@ -113692,7 +112926,7 @@ aKB aRP bfF hYq -sxA +amV hio aFq amx @@ -113742,7 +112976,7 @@ bZk bNh caz bek -bfK +bdb cee cft cgF @@ -113776,8 +113010,8 @@ cNg cOb cPE cQD -cLr -cLr +ikO +ikO cQP cXx cTN @@ -113949,7 +113183,7 @@ aKc aBn lgv aFz -amE +aKc aDY aDO aGB @@ -113982,7 +113216,7 @@ bwm byC bCd bAm -bCn +bHz bEj bHz uuE @@ -113999,7 +113233,7 @@ bYP bNh cbb bek -bfK +bdb cei cOm cgG @@ -114241,7 +113475,7 @@ byz bAn bCo bEk -bFX +blb bhw bMF bLm @@ -114256,7 +113490,7 @@ bNU bNh cbi ben -bfM +bqb bZu cfw cgu @@ -114450,8 +113684,8 @@ amB apE arb aoH -apC -apC +ayG +ayP aso axL avs @@ -114495,7 +113729,7 @@ boI buf bwt cfn -bAo +blb bCp bEl bHC @@ -114526,9 +113760,9 @@ bVk cqB crO cfw -cun -cvx -cwM +cuv +cvz +cic cxO cyW czO @@ -114770,7 +114004,7 @@ tST vtR pyX vNb -bfK +bdb bbi bZU cfE @@ -114965,7 +114199,7 @@ apC apC apC apy -aqV +aAV asr aty avt @@ -115027,7 +114261,7 @@ bZD bZX caM bek -bfK +bdb bbi bZU bVI @@ -115224,9 +114458,9 @@ aoL apz aqX asw -axL +aBM avZ -axf +aCX azd aAv aHf @@ -115284,7 +114518,7 @@ bNh bNh cbj bek -ccS +bfJ cej bZU bVX @@ -115466,7 +114700,7 @@ aaa aaa abq aaa -agD +aaa agC agC agL @@ -115481,7 +114715,7 @@ aoh aoh aqW ast -atB +axL avw axH azx @@ -115798,15 +115032,15 @@ bht deF bNp bek -bdb +bqR cek -ceE -cuV +bwI +bwP cin -chy +bHE dhq cjl -cOM +cjl bVr cqq ctj @@ -115967,7 +115201,7 @@ aaa aaa aaa aaa -sDC +aaa aaa aaa aaa @@ -115988,7 +115222,7 @@ aid aid aid alI -amI +aid aid atK atK @@ -116029,7 +115263,7 @@ bek bgb bfV bjm -blf +bCB bfV bsV bfV @@ -116061,7 +115295,7 @@ bZu bZu bZu bZu -clj +bgZ bZO cqo cfY @@ -116069,7 +115303,7 @@ csn ctE cmz cus -cvD +cvH cic cxU czc @@ -116245,14 +115479,14 @@ afr akC akO alK -amL aid alq alq alq alq alq -atK +alq +alq awd awJ atK @@ -116264,16 +115498,16 @@ aBE aAw akD aEf -ayG -ayG -ayG -cmU -cmU -ayG -aAV +alW +alW +alW +caj +caj +alW +aFT bVi -bXQ -bYF +bad +aQC aTm aWy leu @@ -116285,40 +115519,40 @@ bdi bex bfI bfI -bjn +bQG bfI bnb boO bqu -oJQ +bOV bfI bfI byG -mOc -mOc -mOc -mOc +bfI +bfI +bfI +bfI bHM bJF bLt -mOc +bfI bOV bQG -mOc -mOc -mOc -mOc -mOc -mOc -mOc +bfI +bfI +bme +bfI +bfI +bfI +bfI ccr -bZt +btC aYx cfG cgM cio bZu -clj +bgZ cmz cmz cmz @@ -116502,15 +115736,15 @@ mcY poJ xXW xbe -msg aid alq alq alq alq alq -atF -awl +alq +alq +awp arR amO avl @@ -116520,7 +115754,7 @@ aze aAx aCA akD -aEg +amX alW ajg aBI @@ -116530,7 +115764,7 @@ aBI aBI aBI aQz -aQV +aQC aTo aTr cbe @@ -116544,8 +115778,8 @@ bgd bMR bUM blg -bnc -boP +blg +bzR bqv bsl bMR @@ -116563,7 +115797,7 @@ bfS bqb bdb bdb -bdb +bfK bdb bdb bZt @@ -116575,7 +115809,7 @@ cfA cgN cip bZu -clj +bgZ cmz cnh cpT @@ -116583,7 +115817,7 @@ cqs crX cfw cut -cvD +cvH cwS cxU cze @@ -116758,7 +115992,6 @@ xOM agj azE bPL -azE alE aid alq @@ -116766,9 +115999,10 @@ alq alq alq alq -atF -alW -azL +alq +alq +awp +amI amO avm awG @@ -116777,7 +116011,7 @@ aze aBG aAy akD -aEg +atF caj ajg aKW @@ -116787,7 +116021,7 @@ aBI aSJ aBI aQA -aQV +aQC udB eRU aVO @@ -116820,7 +116054,7 @@ bsp bQI bQI aUX -aUX +bmO aUX bQI bZu @@ -116832,7 +116066,7 @@ cfB cgO ciq bZu -clj +bgZ cmz cnG coS @@ -117016,15 +116250,15 @@ afr aBK bTg deG -amV aid alq alq alq alq alq -atF -amo +alq +alq +awp azL amO avn @@ -117034,7 +116268,7 @@ aze aAz aze akD -aEg +msg alW ajg aId @@ -117044,7 +116278,7 @@ aBI aNK aBI aQB -aQV +aQC aTp ygK aTu @@ -117059,7 +116293,7 @@ blM bjp bez bne -boR +boY bqx blC ded @@ -117089,7 +116323,7 @@ baj cgP baj bZv -clj +bgZ cmz cny cnI @@ -117097,7 +116331,7 @@ cnI crZ cOm cuv -cvD +cvH cwL cxV cxV @@ -117108,8 +116342,8 @@ cxV cxV cGS cFC -cGK -cHF +cGH +cHA cJF cJs cKB @@ -117273,14 +116507,14 @@ aid ays bTf deC -amX aid alq alq alq alq alq -atF +alq +alq awp dFD amO @@ -117291,7 +116525,7 @@ akD akD akD akD -aEg +alW aFT aFy aJw @@ -117301,7 +116535,7 @@ aMp aJw aOZ aQC -aQV +aQC aTq aUy aVP @@ -117375,7 +116609,7 @@ cOr cEK cln clN -chy +crq chy bgZ cPT @@ -117531,24 +116765,24 @@ aid aid aid aid -aid alq alq alq alq alq -atF -awm +alq +alq +awp asA -ayG -ayG -ayG -ayG -ayG -ayG -ayG -ayG -aDd +alW +alW +alW +alW +alW +alW +alW +alW +alW alW aWv aGJ @@ -117558,7 +116792,7 @@ aPS aPS aOZ aQD -aQW +aQD aTo ygK aVQ @@ -117603,7 +116837,7 @@ cbO cgR ciC cjV -cmS +cLz cmz cnF coV @@ -117632,7 +116866,7 @@ cOc cQg cQE cPj -cPj +cxT cRP clT cPT @@ -117815,7 +117049,7 @@ aBI aBI aBI aRn -aQW +aQD aTs spj aVR @@ -117830,7 +117064,7 @@ bhD bjs bkk bne -boR +boY bqz bsm bsm @@ -117860,7 +117094,7 @@ uzt cgS cjf bZv -clj +bgZ cmB cmB cmB @@ -117879,7 +117113,7 @@ cEJ cDI cEI cHF -cGN +cHF cHI cII cLl @@ -117905,7 +117139,7 @@ aaa aaa aaa aaa -cxT +aaa cVG cmG cXV @@ -118072,7 +117306,7 @@ aMr aTg aBI aQI -aQW +aQD aTt wsx aTq @@ -118104,7 +117338,7 @@ bCy bPa bQL bSv -bSt +blx bYs mAt cba @@ -118117,7 +117351,7 @@ cdh cgT cjf bZv -clj +bgZ cmB cnK cnK @@ -118329,7 +117563,7 @@ aBI aBI aBI aVp -aQV +aQC aTu ygK aVT @@ -118344,14 +117578,14 @@ bez bez bez bni -boR +boY bqA bsp buq bwC byL bAv -bCz +bCy bEt bGd bHQ @@ -118360,7 +117594,7 @@ bLA ycU bHO bRU -bSw +bSt bSt bVu mAt @@ -118374,7 +117608,7 @@ cdh bYA chm bZv -clj +bgZ cmB cnK coW @@ -118586,7 +117820,7 @@ aMs aNM aBI aVm -aQV +aQC aTu ygK aVU @@ -118601,23 +117835,23 @@ bhF aoG bll bne -boR +boY bqx bsp bwp -bwD +bEv byM bsp bEE -bCy +biL bIE -bHO -hwe +biW +bkC bLw bCy bPb bQK -bSw +bSt bSt keY vfe @@ -118631,7 +117865,7 @@ cde edg cjf bZv -clo +hLt cmB cnK cnK @@ -118843,7 +118077,7 @@ aBI aBI aBI aVr -aRV +aQC aTu jCi aVV @@ -118858,11 +118092,11 @@ asJ aoG blm bne -boR +boY bqx bsp bus -bwE +bEv byN bsp bsp @@ -118877,8 +118111,8 @@ bQI bSx bUe bUe -bNx -bNz +bSy +gMS bZy cbW cbN @@ -118888,7 +118122,7 @@ cfD bYC cjZ bZv -clj +bgZ cmB cnL coY @@ -119115,7 +118349,7 @@ buC aoG aoG bne -boR +boY buV bsp bxe @@ -119145,7 +118379,7 @@ cdh bYB cjf bZv -clj +bgZ cmB cnM cnK @@ -119349,7 +118583,7 @@ aPW avr aFK aFG -aGN +aJE aIl aJD aLe @@ -119402,7 +118636,7 @@ cdh bYB ckS bZv -clj +bgZ cmB cnN cnK @@ -119610,8 +118844,8 @@ aGO aIp qTK aLf -aLf -aLf +aQW +aQW bVo aQL aRY @@ -119629,11 +118863,11 @@ ape aoG aoG bne -boR +boY bqx aoG buv -bwP +cnR aoG bAx bCC @@ -119659,7 +118893,7 @@ imQ gaa cku bZv -clj +bgZ cmB cnK cnK @@ -119886,11 +119120,11 @@ aaa aaa blo bnk -boW +bpb bqC aoG bxI -bwI +asJ aoG bsp bEP @@ -119916,7 +119150,7 @@ cfM cgl cll bZv -clj +bgZ cmB cmB cmB @@ -120109,21 +119343,21 @@ amc amc apW arm -asC +aDd atR aBy gQu ayc azZ awR -aBM +aFI aCW aEo aFI aGQ aJF fUI -aLf +aQV aMy aNQ aUf @@ -120142,7 +119376,7 @@ beC aZK beC beC -bnl +bne boX bqD bsq @@ -120374,7 +119608,7 @@ ayd azj azj aBO -aCX +azj aEp aFJ aGR @@ -120399,7 +119633,7 @@ bgm bhI bjv beC -bnm +bne boY bqx aoG @@ -120407,8 +119641,8 @@ aoG bbE aoG bAz -bCG -bEz +bEv +bEA bEv bCH bJM @@ -120430,7 +119664,7 @@ cfS bZC chr bZv -clr +bqV aoG aoG aoG @@ -120657,7 +119891,7 @@ bhJ bjw beC bnn -boR +boY bqE aoG buy @@ -120666,10 +119900,10 @@ aoG bCJ bCH bEA -bGl -bHE +bCH +bvz bHI -bIh +bvz bCH bEv bQT @@ -120678,7 +119912,7 @@ bUj bUj bXn bPO -cal +cao caS bQI cdk @@ -120687,7 +119921,7 @@ cfR bZB cgV bZv -cnP +bwZ asJ coI aoG @@ -120914,7 +120148,7 @@ bbx beC beC bne -boR +boY buV aoG buz @@ -120926,7 +120160,7 @@ bEB bHU bHU nhP -bLH +bHU bHU bPd bEG @@ -120941,10 +120175,10 @@ bQI bZv bZv bZv -caV +cjV ciA bZv -kUj +azy asJ asI aoG @@ -121171,7 +120405,7 @@ bhL bjx bbH bne -boR +boY bqx aoG arr @@ -121194,14 +120428,14 @@ bXo bEG cap cdi -mcn -mcn +aGW +aGW cex -mcn -chD +aGW clq -mcn -ceA +clq +aGW +bal asJ coM aoG @@ -121403,7 +120637,7 @@ avv aAJ aBR avv -aEu +gip avv aIc aIs @@ -121437,23 +120671,23 @@ bCe bAB aoG bED -bHW -bHW +biM +biM gIN bLJ -bKm -bKm +bLJ +bLJ bQU bTQ uBN bVB bXp bEG -bXi -bYy +asJ +azy asJ asJ -kUj +azy asJ asJ asJ @@ -121660,7 +120894,7 @@ avv aCi aBS avv -aEu +gip avv aIm aIt @@ -121703,14 +120937,14 @@ bPg bEG bTP bUl -bUl +bnc bXq bEG caI caX asI asI -cez +bak bxI asI aoG @@ -121942,7 +121176,7 @@ bhJ bnJ bbH bne -boR +boY bqx aoG aoG @@ -121964,10 +121198,10 @@ bVD bXr bEG asJ -kUj +azy arr asI -kUj +azy asJ cis buC @@ -122220,11 +121454,11 @@ bEG bVE bEG bEG -bZF -ofz +bah +bal bdl asI -kUj +azy asJ cir buC @@ -122469,19 +121703,19 @@ aGW aGW aGW bOy -bNF -bNF -bNF -bSC -bNF +aGW +aGW +aGW +aNR +aGW bWT bNF bNF ofz caZ -cbX -asI -kUj +bpj +bwD +azy asJ cfK cfK @@ -122737,8 +121971,8 @@ aoG aoG aoG asI -asI -kUj +bwE +azy asJ cfK ciD @@ -122970,7 +122204,7 @@ bmm bnM bam bne -boR +boY bqK bqx bwo @@ -122995,7 +122229,7 @@ bVL aoG cbX cdm -ceA +bal asJ cfK chs @@ -123261,7 +122495,7 @@ clz bkY brW clF -cso +cqQ bKx bKx bKx @@ -123514,7 +122748,7 @@ cfK cfK chQ aRQ -cly +cso cly cor clA @@ -123726,7 +122960,7 @@ nMC aNV sBY sBY -sBY +aNV nMC aST aUK @@ -123771,7 +123005,7 @@ cfL ciu ciH bhv -biB +clJ biB bul clB @@ -124029,8 +123263,8 @@ cgW chX cjB cle -cle -cle +cmM +cmM cqa cqP ctn @@ -124288,7 +123522,7 @@ cjq cEC bkZ cou -clD +cNm cqI cNm cuO @@ -124501,8 +123735,8 @@ aIA aWn aIA aWm -aXz -aZw +aIB +aJO bcr bam bam @@ -124513,8 +123747,8 @@ bam bam bnw bpi -bqQ -bqR +bpn +bsz dqh bAs bjN @@ -124769,9 +124003,9 @@ bkT aFR bmu bnx -bpj -bqR +bpi bpn +bsz dqh bAr bjN @@ -124998,7 +124232,7 @@ avC awL aAL ayr -atA +aCZ aCa aCg aFM @@ -125027,7 +124261,7 @@ bmh bof bny bpk -foM +bfM mDj buJ bzv @@ -125572,7 +124806,7 @@ ciN ckh bzL abq -bzL +bZN cpi cqL csq @@ -125824,14 +125058,14 @@ cce cdx uUE cfQ -bSP +clD ciO ckj chR cmL cnY cpj -cqS +cqK cqK bGL abq @@ -126078,7 +125312,7 @@ bWU bCN biz ccf -bGG +bIq nzX bIn chi @@ -126335,10 +125569,10 @@ bCN bCN cDd ccf -bGG -nzX -bGG bIq +nzX +bIo +bIp ciQ cki cgn @@ -126591,16 +125825,16 @@ bXJ bZG bCN biA -ccf -bGG +cct +cdS nzX -bGG +chk bIq ciR ckk bzL abq -bzL +bZN cpl cqO csr @@ -126848,18 +126082,18 @@ bXw bYL bZL bKa -bMc -bGG +bGK +bMd nzX ceI chj ciS ckj chR -cmM +cmL cnY cpm -crl +cqN cqN bGL abq @@ -127109,11 +126343,11 @@ bGG bGG nzX bPw -chk +bIq ciE -ckj -chR -cmN +ckh +bzL +abq bGL bGL bGL @@ -127373,7 +126607,7 @@ cij cmO cnZ cpn -cqQ +css css bGL abq @@ -127628,7 +126862,7 @@ ciV ckh bzL abq -bzL +bZN cpo cqR cst @@ -127887,7 +127121,7 @@ cij cmO coa cpp -crq +css css bGL abq @@ -129148,20 +128382,20 @@ abq aaa abq bGL -bIv -bzL +bMk +bZN bMk bGL -bIv -bzL +bMk +bZN bMk bGL -bIv -bzL +bMk +bZN bMk bGL -bIv -bzL +bMk +bZN bMk bGL abq @@ -129663,8 +128897,8 @@ aaa abq bGL bIx -bIx -bIx +bOO +bOO bGL bPE bRk @@ -129919,21 +129153,21 @@ abq abq abq bGL -bIx +bOO bKi bOO bGL bPE bRl -bUu +bPE bGL -bVW +bVV bXB -bZN +bVV bGL cbl ccj -cdS +cbl bGL abq aUV diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index a4efbde1682..1acf135edc8 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1620,6 +1620,7 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, +/obj/machinery/suit_storage_unit/gamma, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "fW" = ( @@ -3547,6 +3548,12 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/control) +"nb" = ( +/obj/machinery/autolathe/upgraded/gamma, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "nc" = ( /obj/machinery/door/airlock/centcom{ name = "Gamma Armory"; @@ -4076,18 +4083,12 @@ /area/centcom/gamma) "oJ" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, -/obj/item/gun/projectile/automatic/pistol{ - name = "pistol" - }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/projectile/automatic/proto, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "oN" = ( @@ -4258,14 +4259,6 @@ /obj/structure/flora/ausbushes, /turf/simulated/floor/grass, /area/centcom/specops) -"pk" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/gun/rocketlauncher, -/turf/simulated/floor/mineral/plastitanium/red, -/area/shuttle/gamma/space) "pl" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4317,9 +4310,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "pu" = ( -/obj/mecha/combat/durand/loaded{ - operation_req_access = list(1) - }, +/obj/mecha/combat/marauder/ares/loaded, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -4527,6 +4518,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) +"qf" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/medbeam, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "qh" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ @@ -9964,6 +9960,12 @@ icon_state = "red" }, /area/holodeck/source_knightarena) +"LN" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/shuttle/gamma/space) "LO" = ( /obj/machinery/autolathe/upgraded{ hacked = 1 @@ -25459,8 +25461,8 @@ th fm of oB -pf -pf +LN +nb pf fV of @@ -25717,7 +25719,7 @@ fm of oJ pf -pk +po pf pq of @@ -25974,7 +25976,7 @@ fm of oW pf -po +qf pf pu of diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index e2068cecb89..bf1b7426288 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -66,6 +66,7 @@ /datum/controller/subsystem/##X/New(){\ NEW_SS_GLOBAL(SS##X);\ PreInit();\ + ss_id=#X;\ }\ /datum/controller/subsystem/##X @@ -73,5 +74,6 @@ /datum/controller/subsystem/processing/##X/New(){\ NEW_SS_GLOBAL(SS##X);\ PreInit();\ + ss_id="processing_[#X]";\ }\ /datum/controller/subsystem/processing/##X diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index a633ddab5eb..4950beb7e74 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -40,7 +40,6 @@ #define BELOW_OPEN_DOOR_LAYER 2.6 #define BLASTDOOR_LAYER 2.65 #define OPEN_DOOR_LAYER 2.7 -#define DOOR_HELPER_LAYER 2.71 //keep this above OPEN_DOOR_LAYER #define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible #define TABLE_LAYER 2.8 #define BELOW_OBJ_LAYER 2.9 @@ -52,6 +51,7 @@ #define SHUTTER_LAYER 3.12 // HERE BE DRAGONS #define ABOVE_OBJ_LAYER 3.2 #define ABOVE_WINDOW_LAYER 3.3 +#define DOOR_HELPER_LAYER 3.31 // Keep this above doors and windoors #define SIGN_LAYER 3.4 #define NOT_HIGH_OBJ_LAYER 3.5 #define HIGH_OBJ_LAYER 3.6 @@ -118,5 +118,8 @@ #define SPLASHSCREEN_LAYER 23 #define SPLASHSCREEN_PLANE 23 +// This should always be on top. +#define HUD_PLANE_BUILDMODE 30 + ///Plane master controller keys #define PLANE_MASTERS_GAME "plane_masters_game" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 67d9a70bb19..2b95577ef3c 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -130,6 +130,8 @@ #define SOUTH_OF_TURF(T) locate(T.x, T.y - 1, T.z) #define WEST_OF_TURF(T) locate(T.x - 1, T.y, T.z) +#define ATOM_COORDS(A) list(A.x, A.y, A.z) + #define MIN_SUPPLIED_LAW_NUMBER 15 #define MAX_SUPPLIED_LAW_NUMBER 50 diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index ed76f6fd3ff..ac0972850ea 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -45,7 +45,8 @@ // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. #define INIT_ORDER_PROFILER 101 -#define INIT_ORDER_TITLE 100 // Load this quickly so people dont see a blank lobby screen +#define INIT_ORDER_QUEUE 100 // Load this quickly so people cant queue skip +#define INIT_ORDER_TITLE 99 // Load this quickly so people dont see a blank lobby screen #define INIT_ORDER_GARBAGE 21 #define INIT_ORDER_DBCORE 20 #define INIT_ORDER_BLACKBOX 19 diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index c61d8319d39..81ef450643b 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -50,7 +50,7 @@ GLOBAL_PROTECT(log_end) /proc/log_access_in(client/new_client) if(GLOB.configuration.logging.access_logging) - var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]" + var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version].[new_client.byond_build]" rustg_log_write(GLOB.world_game_log, "ACCESS IN: [message][GLOB.log_end]") /proc/log_access_out(mob/last_mob) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 5f6e01e93ed..a4b9d572154 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -203,5 +203,6 @@ GLOBAL_VAR_INIT(midnight_rollovers, 0) GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) /proc/update_midnight_rollover() if(world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS! - return GLOB.midnight_rollovers++ + GLOB.midnight_rollovers++ + GLOB.rollovercheck_last_timeofday = world.timeofday return GLOB.midnight_rollovers diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index b962907d043..dcf304314bb 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -43,9 +43,9 @@ return num //Returns the hex value of a number given a value assumed to be a base-ten value -/proc/num2hex(num, placeholder) - if(!isnum(num)) return - if(placeholder == null) placeholder = 2 +/proc/num2hex(num, placeholder = 2) + if(!isnum(num) || num < 0) + return var/hex = "" while(num) diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 0684be758cd..9477c91fd04 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -44,7 +44,8 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li "vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead", "mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte", "cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk", - "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe")) + "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe", + "arnold_palmer","gimlet","sidecar","whiskeysour","mintjulep","pinacolada")) //Liver Toxins list GLOBAL_LIST_INIT(liver_toxins, list("toxin", "plasma", "sacid", "facid", "cyanide","amanitin", "carpotoxin")) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index 40dfb374170..49bef9c90cd 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -50,8 +50,6 @@ GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE) GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc -GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled - GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index b023aaa4dd0..74453f47c62 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -67,6 +67,9 @@ if(modifiers["shift"] && modifiers["alt"]) AltShiftClickOn(A) return + if(modifiers["shift"] && modifiers["middle"]) + ShiftMiddleClickOn(A) + return if(modifiers["middle"]) MiddleClickOn(A) if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden. @@ -128,6 +131,8 @@ A.AICtrlShiftClick(src) /mob/living/silicon/ai/AltShiftClickOn(atom/A) A.AIAltShiftClick(src) +/mob/living/silicon/ai/ShiftMiddleClickOn(atom/A) + A.AIShiftMiddleClick(src) /mob/living/silicon/ai/ShiftClickOn(atom/A) A.AIShiftClick(src) /mob/living/silicon/ai/CtrlClickOn(atom/A) @@ -148,6 +153,9 @@ /atom/proc/AIAltShiftClick() return +/atom/proc/AIShiftMiddleClick() + return + /atom/proc/AIShiftClick(mob/living/user) // borgs use this too if(user.client) user.examinate(src) @@ -215,3 +223,8 @@ if(!ai_control_check(user)) return toggle_light(user) + +/obj/machinery/door/airlock/AIShiftMiddleClick(mob/user) // Toggles door timings. + if(!ai_control_check(user)) + return + toggle_speed(user) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 77a4ae192f1..cb483601e26 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -363,9 +363,11 @@ A.AltShiftClick(src) return -/atom/proc/AltShiftClick(mob/user) +/mob/proc/ShiftMiddleClickOn(atom/A) return +/atom/proc/AltShiftClick(mob/user) + return /* Misc helpers diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 40fcfc82671..706c9304e20 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -30,6 +30,9 @@ if(modifiers["middle"] && modifiers["ctrl"]) CtrlMiddleClickOn(A) return + if(modifiers["shift"] && modifiers["middle"]) + ShiftMiddleClickOn(A) + return if(modifiers["middle"]) MiddleClickOn(A) return @@ -126,7 +129,8 @@ A.BorgCtrlShiftClick(src) /mob/living/silicon/robot/AltShiftClickOn(atom/A) A.BorgAltShiftClick(src) - +/mob/living/silicon/robot/ShiftMiddleClickOn(atom/A) + A.BorgShiftMiddleClick(src) /atom/proc/BorgShiftClick(mob/user) if(user.client && user.client.eye == user) @@ -148,6 +152,8 @@ /atom/proc/BorgAltShiftClick() return +/atom/proc/BorgShiftMiddleClick() + return // AIRLOCKS @@ -163,6 +169,8 @@ /obj/machinery/door/airlock/BorgAltShiftClick(mob/living/silicon/robot/user) // Enables emergency override on doors! Forwards to AI code. AIAltShiftClick(user) +/obj/machinery/door/airlock/BorgShiftMiddleClick(mob/living/silicon/robot/user) //Toggles door timing. Forwards to AI code. + AIShiftMiddleClick(user) // APC diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 91fe0c99bf7..57401e9dde1 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -176,8 +176,3 @@ //1 = standard hud //2 = reduced hud (just hands and intent switcher) //3 = no hud (for screenshots) - - -#define HUD_LAYER_SCREEN 20 - -#define HUD_LAYER_BUILDMODE 30 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 2eb3d0b36ed..c88dd0671b1 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -616,7 +616,7 @@ so as to remain in compliance with the most up-to-date laws." if(stone) if(alert(usr, "Do you want to be captured by [stoner]'s soul stone? This will destroy your corpse and make it \ impossible for you to get back into the game as your regular character.",, "No", "Yes") == "Yes") - stone.opt_in = TRUE + stone?.opt_in = TRUE /obj/screen/alert/notify_soulstone/Destroy() stone = null diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm index c4938d3efc6..d9494c31652 100644 --- a/code/controllers/configuration/configuration_core.dm +++ b/code/controllers/configuration/configuration_core.dm @@ -32,7 +32,9 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) var/datum/configuration_section/logging_configuration/logging /// Holder for the MC configuration datum var/datum/configuration_section/mc_configuration/mc - /// Holder for the MC configuration datum + /// Holder for the metrics configuration datum + var/datum/configuration_section/metrics_configuration/metrics + /// Holder for the movement configuration datum var/datum/configuration_section/movement_configuration/movement /// Holder for the overflow configuration datum var/datum/configuration_section/overflow_configuration/overflow @@ -71,6 +73,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) jobs = new() logging = new() mc = new() + metrics = new() movement = new() overflow = new() ruins = new() @@ -99,6 +102,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new()) jobs.load_data(raw_config_data["job_configuration"]) logging.load_data(raw_config_data["logging_configuration"]) mc.load_data(raw_config_data["mc_configuration"]) + metrics.load_data(raw_config_data["metrics_configuration"]) movement.load_data(raw_config_data["movement_configuration"]) overflow.load_data(raw_config_data["overflow_configuration"]) ruins.load_data(raw_config_data["ruin_configuration"]) diff --git a/code/controllers/configuration/sections/general_configuration.dm b/code/controllers/configuration/sections/general_configuration.dm index 296304c28b7..816775fa6d9 100644 --- a/code/controllers/configuration/sections/general_configuration.dm +++ b/code/controllers/configuration/sections/general_configuration.dm @@ -14,8 +14,6 @@ var/lobby_time = 240 /// Ban all Guest BYOND accounts var/guest_ban = TRUE - /// Player threshold to automatically enable panic bunker - var/panic_bunker_threshold = 150 /// Allow players to use AntagHUD? var/allow_antag_hud = TRUE /// Forbid players from rejoining if they use AntagHUD? @@ -121,7 +119,6 @@ // Numbers CONFIG_LOAD_NUM(lobby_time, data["lobby_time"]) - CONFIG_LOAD_NUM(panic_bunker_threshold, data["panic_bunker_threshold"]) CONFIG_LOAD_NUM(base_loadout_points, data["base_loadout_points"]) CONFIG_LOAD_NUM(cryo_penalty_period, data["cryo_penalty_period"]) CONFIG_LOAD_NUM(minimum_client_build, data["minimum_client_build"]) diff --git a/code/controllers/configuration/sections/metrics_configuration.dm b/code/controllers/configuration/sections/metrics_configuration.dm new file mode 100644 index 00000000000..e35e0c7a74c --- /dev/null +++ b/code/controllers/configuration/sections/metrics_configuration.dm @@ -0,0 +1,17 @@ +/// Config holder for stuff relating to metrics management +/datum/configuration_section/metrics_configuration + // NO EDITS OR READS TO THIS EVER + protection_state = PROTECTION_PRIVATE + /// Are metrics enabled or disabled + var/enable_metrics = FALSE + /// Endpoint to send metrics to, including protocol + var/metrics_endpoint = null + /// Endpoint authorisation API key + var/metrics_api_token = null + +/datum/configuration_section/metrics_configuration/load_data(list/data) + // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line + CONFIG_LOAD_BOOL(enable_metrics, data["enable_metrics"]) + + CONFIG_LOAD_STR(metrics_endpoint, data["metrics_endpoint"]) + CONFIG_LOAD_STR(metrics_api_token, data["metrics_api_token"]) diff --git a/code/controllers/configuration/sections/system_configuration.dm b/code/controllers/configuration/sections/system_configuration.dm index a0354bb2b77..42e563d7057 100644 --- a/code/controllers/configuration/sections/system_configuration.dm +++ b/code/controllers/configuration/sections/system_configuration.dm @@ -14,6 +14,8 @@ var/shutdown_shell_command = null /// 2FA backend server host var/_2fa_auth_host = null + /// List of IP addresses which bypass world topic rate limiting + var/list/topic_ip_ratelimit_bypass = list() /datum/configuration_section/system_configuration/load_data(list/data) // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line @@ -24,3 +26,5 @@ CONFIG_LOAD_STR(medal_hub_password, data["medal_hub_password"]) CONFIG_LOAD_STR(shutdown_shell_command, data["shutdown_shell_command"]) CONFIG_LOAD_STR(_2fa_auth_host, data["_2fa_auth_host"]) + + CONFIG_LOAD_LIST(topic_ip_ratelimit_bypass, data["topic_ip_ratelimit_bypass"]) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index f187fb7a9b9..58216c38233 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -2,6 +2,8 @@ /datum/controller/subsystem // Metadata; you should define these. name = "fire codertrain" //name of the subsystem + /// Subsystem ID. Used for when we need a technical name for the SS + var/ss_id = "fire_codertrain_again" var/init_order = INIT_ORDER_DEFAULT //order of initialization. Higher numbers are initialized first, lower numbers later. Use defines in __DEFINES/subsystems.dm for easy understanding of order. var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. var/priority = FIRE_PRIORITY_DEFAULT //When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep @@ -227,3 +229,17 @@ if("queued_priority") //editing this breaks things. return 0 . = ..() + +/** + * Returns the metrics for the subsystem. + * + * This can be overriden on subtypes for variables that could affect tick usage + * Example: ATs on SSair + */ +/datum/controller/subsystem/proc/get_metrics() + SHOULD_CALL_PARENT(TRUE) + var/list/out = list() + out["cost"] = cost + out["tick_usage"] = tick_usage + out["custom"] = list() // Override as needed on child + return out diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm index 119d82113d7..3dbea1c3c15 100644 --- a/code/controllers/subsystem/acid.dm +++ b/code/controllers/subsystem/acid.dm @@ -11,6 +11,11 @@ SUBSYSTEM_DEF(acid) /datum/controller/subsystem/acid/stat_entry() ..("P:[processing.len]") +/datum/controller/subsystem/acid/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust /datum/controller/subsystem/acid/fire(resumed = 0) if(!resumed) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 324df11b8d1..6df1d4a1ba4 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -66,6 +66,12 @@ SUBSYSTEM_DEF(air) msg += "AT/MS:[round((cost ? active_turfs.len/cost : 0),0.1)]" ..(msg) +/datum/controller/subsystem/air/get_metrics() + . = ..() + var/list/cust = list() + cust["active_turfs"] = length(active_turfs) + cust["hotspots"] = length(hotspots) + .["custom"] = cust /datum/controller/subsystem/air/Initialize(timeofday) setup_overlays() // Assign icons and such for gas-turf-overlays diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm index 65adebb6639..2481891000c 100644 --- a/code/controllers/subsystem/fires.dm +++ b/code/controllers/subsystem/fires.dm @@ -12,6 +12,12 @@ SUBSYSTEM_DEF(fires) ..("P:[processing.len]") +/datum/controller/subsystem/fires/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/fires/fire(resumed = 0) if(!resumed) src.currentrun = processing.Copy() diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index e66b93b6eda..03f630148e0 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -61,6 +61,22 @@ SUBSYSTEM_DEF(garbage) msg += " | Fail:[fail_counts.Join(",")]" ..(msg) +/datum/controller/subsystem/garbage/get_metrics() + . = ..() + var/list/cust = list() + if((delslasttick + gcedlasttick) == 0) // Account for DIV0 + cust["gcr"] = 0 + else + cust["gcr"] = (gcedlasttick / (delslasttick + gcedlasttick)) + cust["total_harddels"] = totaldels + cust["total_softdels"] = totalgcs + var/i = 0 + for(var/list/L in queues) + i++ + cust["queue_[i]"] = length(L) + + .["custom"] = cust + /datum/controller/subsystem/garbage/Shutdown() //Adds the del() log to the qdel log file var/list/dellog = list() diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index e12c6be07df..f197fbc735e 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -11,6 +11,14 @@ SUBSYSTEM_DEF(lighting) /datum/controller/subsystem/lighting/stat_entry() ..("L:[length(sources_queue)]|C:[length(corners_queue)]|O:[length(objects_queue)]") +/datum/controller/subsystem/lighting/get_metrics() + . = ..() + var/list/cust = list() + cust["sources_queue"] = length(sources_queue) + cust["corners_queue"] = length(corners_queue) + cust["objects_queue"] = length(objects_queue) + .["custom"] = cust + /datum/controller/subsystem/lighting/Initialize(timeofday) if(!initialized) if(GLOB.configuration.general.starlight) diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm index cebc6a5f768..96eac799ae0 100644 --- a/code/controllers/subsystem/machinery.dm +++ b/code/controllers/subsystem/machinery.dm @@ -20,6 +20,12 @@ SUBSYSTEM_DEF(machines) fire() return ..() +/datum/controller/subsystem/machines/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/machines/proc/makepowernets() for(var/datum/powernet/PN in powernets) qdel(PN) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 014b247ba9e..c6e3562bd97 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(mapping) log_startup_progress("Populating lavaland...") var/lavaland_setup_timer = start_watch() seedRuins(list(level_name_to_num(MINING)), GLOB.configuration.ruins.lavaland_ruin_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates) - spawn_rivers(list(level_name_to_num(MINING))) + spawn_rivers(level_name_to_num(MINING)) log_startup_progress("Successfully populated lavaland in [stop_watch(lavaland_setup_timer)]s.") // Now we make a list of areas for teleport locs diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm new file mode 100644 index 00000000000..7ebaadfae77 --- /dev/null +++ b/code/controllers/subsystem/metrics.dm @@ -0,0 +1,47 @@ +SUBSYSTEM_DEF(metrics) + name = "Metrics" + wait = 30 SECONDS + offline_implications = "Server metrics will no longer be ingested into monitoring systems. No immediate action is needed." + runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL THE LEVELS + flags = SS_KEEP_TIMING // This needs to ingest every 30 IRL seconds, not ingame seconds. + /// The real time of day the server started. Used to calculate time drift + var/world_init_time = 0 // Not set in here. Set in world/New() + +/datum/controller/subsystem/metrics/Initialize(start_timeofday) + if(!GLOB.configuration.metrics.enable_metrics) + flags |= SS_NO_FIRE // Disable firing to save CPU + return ..() + + +/datum/controller/subsystem/metrics/fire(resumed) + SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, GLOB.configuration.metrics.metrics_endpoint, get_metrics_json(), list( + "Authorization" = "ApiKey [GLOB.configuration.metrics.metrics_api_token]", + "Content-Type" = "application/json" + )) + +/datum/controller/subsystem/metrics/proc/get_metrics_json() + var/list/out = list() + out["@timestamp"] = time_stamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS. + out["cpu"] = world.cpu + // out["maptick"] = world.map_cpu // TODO: 514 + out["elapsed_processed"] = world.time + out["elapsed_real"] = (REALTIMEOFDAY - world_init_time) + out["client_count"] = length(GLOB.clients) + out["round_id"] = text2num(GLOB.round_id) // This is so we can filter the metrics by a single round ID + + // Funnel in all SS metrics + var/list/ss_data = list() + for(var/datum/controller/subsystem/SS in Master.subsystems) + ss_data[SS.ss_id] = SS.get_metrics() + + out["subsystems"] = ss_data + // And send it all + return json_encode(out) + +/* + +// Uncomment this if you add new metrics to verify how the JSON formats + +/client/verb/debugmetricts() + usr << browse(SSmetrics.get_metrics_json(), "window=aadebug") +*/ diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index e024a1f3d4e..def8a807853 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -12,6 +12,12 @@ SUBSYSTEM_DEF(mobs) /// The amount of giant spiders that exist in the world. Used for mob capping. var/giant_spiders = 0 +/datum/controller/subsystem/mobs/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(GLOB.mob_living_list) + .["custom"] = cust + /datum/controller/subsystem/mobs/stat_entry() ..("P:[GLOB.mob_living_list.len]") diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 5302314589d..b08aae88a23 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -14,6 +14,12 @@ SUBSYSTEM_DEF(processing) /datum/controller/subsystem/processing/stat_entry() ..("[stat_tag]:[processing.len]") +/datum/controller/subsystem/processing/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/processing/fire(resumed = 0) if(!resumed) currentrun = processing.Copy() diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index fb86110a5f5..da526e9d869 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -1,9 +1,16 @@ PROCESSING_SUBSYSTEM_DEF(radiation) name = "Radiation" - flags = SS_NO_INIT | SS_BACKGROUND + flags = SS_BACKGROUND | SS_NO_INIT wait = 1 SECONDS offline_implications = "Radiation will no longer function; power generation may not happen. A restart may or may not be required, depending on the situation." var/list/warned_atoms = list() + // Cache radiation levels for each turf so it doesn't need to be done iteratively + // turf_rad_cache is the state in the current loop, and may not be 100% representative + // until processing is complete. + // prev_rad_cache is the fully evaluated radiation state cache from the previous tick. + var/list/turf_rad_cache = list() + var/list/prev_rad_cache = list() + /datum/controller/subsystem/processing/radiation/proc/warn(datum/component/radioactive/contamination) if(!contamination || QDELETED(contamination)) @@ -16,3 +23,26 @@ PROCESSING_SUBSYSTEM_DEF(radiation) SSblackbox.record_feedback("tally", "contaminated", 1, master.type) var/msg = "has become contaminated with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]" master.investigate_log(msg, "radiation") + +/datum/controller/subsystem/processing/radiation/fire(resumed) + refresh_rad_cache() + . = ..() + +/datum/controller/subsystem/processing/radiation/proc/get_turf_radiation(turf/place) + if (prev_rad_cache[place]) + return prev_rad_cache[place] + else + return 0 + +/datum/controller/subsystem/processing/radiation/proc/update_rad_cache(datum/component/radioactive/thing) + var/atom/owner = thing.parent + var/turf/place = get_turf(owner) + if (turf_rad_cache[place]) + turf_rad_cache[place] += thing.strength + else + turf_rad_cache[place] = thing.strength + + +/datum/controller/subsystem/processing/radiation/proc/refresh_rad_cache() + prev_rad_cache = turf_rad_cache.Copy() + turf_rad_cache = list() diff --git a/code/controllers/subsystem/server_queue.dm b/code/controllers/subsystem/server_queue.dm new file mode 100644 index 00000000000..7855c870918 --- /dev/null +++ b/code/controllers/subsystem/server_queue.dm @@ -0,0 +1,45 @@ +#define QUEUE_DATA_FILE "data/queue_data.json" +// These are defines for the sake of making sure we get the right keys +#define QUEUE_DATA_FILE_THRESHOLD_KEY "threshold" +#define QUEUE_DATA_FILE_ENABLED_KEY "enabled" +#define QUEUE_DATA_FILE_PERSISTENT_KEY "persistent" + +SUBSYSTEM_DEF(queue) + name = "Server Queue" + init_order = INIT_ORDER_QUEUE // 100 + flags = SS_NO_FIRE + /// Threshold of players to queue new people + var/queue_threshold = 0 + /// Whether the queue is enabled or not + var/queue_enabled = FALSE + /// Whether to persist these settings over multiple rounds + var/persist_queue = FALSE + /// List of ckeys allowed to bypass queue this round + var/list/queue_bypass_list = list() + /// Last world.time we let a ckey in. 3 second delay between each letin to avoid a mass bubble + var/last_letin_time = 0 + +/datum/controller/subsystem/queue/Initialize(start_timeofday) + if(fexists(QUEUE_DATA_FILE)) + try + var/F = file2text(QUEUE_DATA_FILE) + var/list/data = json_decode(F) + queue_threshold = data[QUEUE_DATA_FILE_THRESHOLD_KEY] + queue_enabled = data[QUEUE_DATA_FILE_ENABLED_KEY] + persist_queue = data[QUEUE_DATA_FILE_PERSISTENT_KEY] + catch + stack_trace("Failed to load [QUEUE_DATA_FILE] from disk due to malformed JSON. You may need to setup the queue again.") + + return ..() + +/datum/controller/subsystem/queue/Shutdown() + // Save if persistent + if(persist_queue) + if(fexists(QUEUE_DATA_FILE)) + fdel(QUEUE_DATA_FILE) + var/data = list() + data[QUEUE_DATA_FILE_THRESHOLD_KEY] = queue_threshold + data[QUEUE_DATA_FILE_ENABLED_KEY] = queue_enabled + data[QUEUE_DATA_FILE_PERSISTENT_KEY] = persist_queue + var/json_data = json_encode(data) + text2file(json_data, QUEUE_DATA_FILE) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 85e9e5da52c..71c504b3032 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -37,7 +37,6 @@ SUBSYSTEM_DEF(shuttle) var/list/shoppinglist = list() var/list/requestlist = list() var/list/supply_packs = list() - var/datum/round_event/shuttle_loan/shuttle_loan var/sold_atoms = "" var/list/hidden_shuttle_turfs = list() //all turfs hidden from navigation computers associated with a list containing the image hiding them and the type of the turf they are pretending to be var/list/hidden_shuttle_turf_images = list() //only the images from the above list diff --git a/code/controllers/subsystem/spacedrift.dm b/code/controllers/subsystem/spacedrift.dm index d9c46f9c9d7..8dd64dced5f 100644 --- a/code/controllers/subsystem/spacedrift.dm +++ b/code/controllers/subsystem/spacedrift.dm @@ -12,6 +12,11 @@ SUBSYSTEM_DEF(spacedrift) /datum/controller/subsystem/spacedrift/stat_entry() ..("P:[processing.len]") +/datum/controller/subsystem/spacedrift/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust /datum/controller/subsystem/spacedrift/fire(resumed = 0) if(!resumed) diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index adc92c627a2..5eb4d09aa3a 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -27,6 +27,13 @@ SUBSYSTEM_DEF(tgui) /datum/controller/subsystem/tgui/stat_entry() ..("P:[processing_uis.len]") +/datum/controller/subsystem/tgui/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing_uis) + .["custom"] = cust + + /datum/controller/subsystem/tgui/fire(resumed = 0) if (!resumed) src.currentrun = processing_uis.Copy() @@ -119,7 +126,7 @@ SUBSYSTEM_DEF(tgui) * Close all UIs attached to src_object. * Returns the number of UIs closed. * - * * datum/src_objectThe object/datum which owns the UIs. + * * datum/src_object - The object/datum which owns the UIs. */ /datum/controller/subsystem/tgui/proc/close_uis(datum/src_object) if(!src_object.unique_datum_id) // First check if the datum has an UID set diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 04ddf40f442..be2d62e09e9 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -15,6 +15,12 @@ SUBSYSTEM_DEF(throwing) /datum/controller/subsystem/throwing/stat_entry() ..("P:[processing.len]") +/datum/controller/subsystem/throwing/get_metrics() + . = ..() + var/list/cust = list() + cust["processing"] = length(processing) + .["custom"] = cust + /datum/controller/subsystem/throwing/fire(resumed = 0) if(!resumed) src.currentrun = processing.Copy() diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm index 706a498aa64..63e8e33069a 100644 --- a/code/controllers/subsystem/tickets/mentor_tickets.dm +++ b/code/controllers/subsystem/tickets/mentor_tickets.dm @@ -3,6 +3,7 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets /datum/controller/subsystem/tickets/mentor_tickets/New() NEW_SS_GLOBAL(SSmentor_tickets) PreInit() + ss_id = "mentor_tickets" /datum/controller/subsystem/tickets/mentor_tickets name = "Mentor Tickets" diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index d5eb31117e2..0954c39a032 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -41,6 +41,12 @@ SUBSYSTEM_DEF(tickets) var/ticketCounter = 1 +/datum/controller/subsystem/tickets/get_metrics() + . = ..() + var/list/cust = list() + cust["tickets"] = length(allTickets) // Not a perf metric but I want to see a graph where SSair usage spikes and 20 tickets come in + .["custom"] = cust + /datum/controller/subsystem/tickets/Initialize() if(!close_messages) close_messages = list("- [ticket_name] Rejected! -", diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 53d77e8fad6..0a0eade55d7 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -37,6 +37,12 @@ SUBSYSTEM_DEF(timer) /datum/controller/subsystem/timer/stat_entry(msg) ..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]") +/datum/controller/subsystem/timer/get_metrics() + . = ..() + var/list/cust = list() + cust["bucket_count"] = bucket_count + .["custom"] = cust + /datum/controller/subsystem/timer/fire(resumed = FALSE) var/lit = last_invoke_tick var/last_check = world.time - TICKS2DS(BUCKET_LEN*1.5) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 83963e99562..579a6b7c07c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(vote) CHECK_TICK /datum/controller/subsystem/vote/proc/autotransfer() - initiate_vote("crew_transfer","the server") + initiate_vote("crew transfer", "the server") /datum/controller/subsystem/vote/proc/reset() initiator = null @@ -95,7 +95,7 @@ SUBSYSTEM_DEF(vote) choices[GLOB.master_mode] += non_voters if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] - else if(mode == "crew_transfer") + else if(mode == "crew transfer") var/factor = 0.5 switch(world.time / (10 * 60)) // minutes if(0 to 60) @@ -174,9 +174,9 @@ SUBSYSTEM_DEF(vote) if(!SSticker.ticker_going) SSticker.ticker_going = TRUE to_chat(world, "The round will start soon.") - if("crew_transfer") + if("crew transfer") if(. == "Initiate Crew Transfer") - init_shift_change(null, 1) + init_shift_change(null, TRUE) if("map") // Find target map. var/datum/map/top_voted_map @@ -222,7 +222,7 @@ SUBSYSTEM_DEF(vote) if(SSticker.current_state >= 2) return 0 choices.Add(GLOB.configuration.gamemode.votable_modes) - if("crew_transfer") + if("crew transfer") if(check_rights(R_ADMIN|R_MOD)) if(SSticker.current_state <= 2) return 0 @@ -266,16 +266,16 @@ SUBSYSTEM_DEF(vote) Click here or type vote to place your vote. You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."}) switch(vote_type) - if("crew_transfer", "gamemode", "custom", "map") + if("crew transfer", "gamemode", "custom", "map") SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) if(mode == "gamemode" && SSticker.ticker_going) SSticker.ticker_going = FALSE to_chat(world, "Round start has been delayed.") - if(mode == "crew_transfer" && GLOB.ooc_enabled) + if(mode == "crew transfer" && GLOB.ooc_enabled) auto_muted = TRUE GLOB.ooc_enabled = FALSE to_chat(world, "The OOC channel has been automatically disabled due to a crew transfer vote.") - log_admin("OOC was toggled automatically due to crew_transfer vote.") + log_admin("OOC was toggled automatically due to crew transfer vote.") message_admins("OOC has been toggled off automatically.") if(mode == "gamemode" && GLOB.ooc_enabled) auto_muted = TRUE @@ -314,37 +314,41 @@ SUBSYSTEM_DEF(vote) dat += "(Cancel Vote) " else dat += "