From 12c41ec3d30e7a0ec077f4b1340b75129ed65789 Mon Sep 17 00:00:00 2001 From: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com> Date: Sat, 11 Sep 2021 20:28:47 +0200 Subject: [PATCH] Forgot about delta --- _maps/map_files/Delta/delta.dmm | 15046 +++++++++++++----------------- 1 file changed, 6239 insertions(+), 8807 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 9e77a0907f2..d073a1ac714 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -33,14 +33,12 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -49,14 +47,12 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; @@ -91,8 +87,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -470,8 +465,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ name = "Aux Construction Site" @@ -513,8 +507,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -528,8 +521,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -543,8 +535,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/sign/electricshock{ pixel_y = -32 @@ -578,14 +569,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -606,8 +595,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -625,8 +613,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -694,8 +681,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -1377,7 +1363,7 @@ "ahY" = ( /obj/machinery/door_control{ desc = "A remote control-switch for the pod doors."; - id = "npodbay"; + id = "secpodbay"; name = "Pod Door Control"; pixel_y = -24; req_access_txt = "71" @@ -1529,7 +1515,7 @@ /obj/effect/decal/warning_stripes/southwestcorner, /obj/machinery/door_control{ desc = "A remote control-switch for the pod doors."; - id = "npodbay"; + id = "secpodbay"; name = "Pod Door Control"; pixel_x = -24; req_access_txt = "71" @@ -2020,8 +2006,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2197,8 +2182,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2233,12 +2217,6 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "ali" = ( -/obj/machinery/door_control{ - id = "mechpod"; - name = "Mechanic's Inner Door Control"; - pixel_y = -24; - req_access_txt = "70" - }, /obj/structure/table, /obj/item/stack/sheet/metal{ amount = 50 @@ -2350,8 +2328,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Mechanic Workshop"; @@ -2411,8 +2388,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2538,8 +2514,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2663,8 +2638,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2722,8 +2696,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2828,8 +2801,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2967,8 +2939,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3112,8 +3083,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/fore2) @@ -3179,8 +3149,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -3197,8 +3166,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -3299,8 +3267,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -3427,9 +3394,7 @@ /obj/machinery/firealarm{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "aoZ" = ( /obj/machinery/light_switch{ @@ -3438,9 +3403,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "apa" = ( /obj/structure/table/wood, @@ -3482,8 +3445,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/photocopier, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -3544,8 +3506,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/reinforced, /obj/item/crowbar, @@ -3571,8 +3532,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -3584,8 +3544,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -3600,8 +3559,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -3753,9 +3711,7 @@ "apQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "apR" = ( /obj/structure/table/wood, @@ -3790,8 +3746,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -3919,14 +3874,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3984,8 +3937,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt/roach, @@ -4072,23 +4024,17 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqz" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqA" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqB" = ( /obj/structure/table/wood, @@ -4109,9 +4055,7 @@ pixel_x = 4; pixel_y = 3 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqD" = ( /obj/item/twohanded/required/kirbyplants, @@ -4121,17 +4065,13 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqE" = ( /obj/structure/table/wood, /obj/item/clipboard, /obj/item/apc_electronics, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aqF" = ( /turf/simulated/floor/plasteel{ @@ -4190,9 +4130,7 @@ /area/security/vacantoffice) "aqN" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "aqO" = ( /obj/structure/table/wood, @@ -4229,8 +4167,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4301,8 +4238,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, @@ -4411,9 +4347,7 @@ }, /area/maintenance/electrical_shop) "ars" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "art" = ( /obj/structure/chair/comfy/brown{ @@ -4441,9 +4375,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "arv" = ( /obj/structure/chair/comfy/brown{ @@ -4459,9 +4391,7 @@ /area/maintenance/electrical_shop) "arw" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "arx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4474,9 +4404,7 @@ "ary" = ( /obj/structure/computerframe, /obj/item/stack/cable_coil/random, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "arz" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -4514,16 +4442,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "arE" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4531,48 +4456,38 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "arF" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "arG" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "4-8" }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "arH" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -4611,8 +4526,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -4632,8 +4546,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -4647,14 +4560,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -4696,8 +4607,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/southright{ @@ -4711,8 +4621,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/reinforced, /obj/item/folder/red, @@ -4738,8 +4647,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -4777,8 +4685,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -4826,8 +4733,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -4908,15 +4814,11 @@ /obj/item/clipboard, /obj/item/airalarm_electronics, /obj/item/airlock_electronics, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "asm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "asn" = ( /obj/effect/spawner/window/reinforced, @@ -4926,9 +4828,7 @@ "aso" = ( /obj/structure/computerframe, /obj/item/circuitboard/secure_data, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "asp" = ( /obj/machinery/light/small{ @@ -4951,32 +4851,24 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "ast" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "asu" = ( /obj/structure/table/wood, /obj/item/camera_film, /obj/item/camera_film, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "asv" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4998,8 +4890,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -5040,8 +4931,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5114,8 +5004,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -5200,14 +5089,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -5228,8 +5115,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -5262,14 +5148,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 4; @@ -5314,9 +5198,7 @@ /area/maintenance/electrical_shop) "atg" = ( /obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "ath" = ( /obj/effect/decal/cleanable/dirt, @@ -5329,22 +5211,18 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/chair/comfy/brown{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "atj" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/folder/red, @@ -5352,16 +5230,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "atk" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/brown{ dir = 8 @@ -5370,27 +5245,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "atl" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "4-8" }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "atm" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/wood{ broken = 1; @@ -5402,9 +5271,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "ato" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5460,9 +5327,7 @@ /area/security/vacantoffice) "atu" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "atv" = ( /obj/structure/cable, @@ -5470,31 +5335,24 @@ name = "south bump"; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "atw" = ( /obj/structure/table/wood, /obj/item/camera, /obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "atx" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/vacantoffice) "aty" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -5515,8 +5373,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -5593,8 +5450,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5627,8 +5483,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -5647,8 +5502,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -5660,8 +5514,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5675,8 +5528,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5732,8 +5584,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -5898,16 +5749,13 @@ pixel_y = -28 }, /obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aul" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ @@ -5917,16 +5765,12 @@ /area/maintenance/electrical_shop) "aum" = ( /obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aun" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "auo" = ( /obj/structure/cable, @@ -5935,9 +5779,7 @@ name = "south bump"; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "aup" = ( /obj/structure/table/wood, @@ -5946,9 +5788,7 @@ }, /obj/item/folder/red, /obj/item/lighter/zippo, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "auq" = ( /obj/machinery/door/airlock/maintenance, @@ -5959,8 +5799,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -5982,8 +5821,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -5999,8 +5837,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -6131,13 +5968,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/electrical_shop) "auN" = ( /obj/machinery/door/airlock/maintenance, @@ -6180,8 +6014,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -6190,8 +6023,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6203,8 +6035,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -6215,8 +6046,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -6227,8 +6057,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -6245,8 +6074,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/obey{ @@ -6296,14 +6124,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -6315,8 +6141,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -6328,8 +6153,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Checkpoint Maintenance"; @@ -6362,8 +6186,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6384,8 +6207,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -6491,20 +6313,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -6568,8 +6387,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -6584,8 +6402,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -6598,8 +6415,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6613,8 +6429,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -6628,8 +6443,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6647,8 +6461,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6663,8 +6476,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6678,14 +6490,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -6819,8 +6629,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6840,8 +6649,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -6949,14 +6757,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6968,8 +6774,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -6981,14 +6786,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7108,8 +6911,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -7143,8 +6945,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -7158,8 +6959,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -7178,8 +6978,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7190,8 +6989,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -7203,8 +7001,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7215,8 +7012,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -7229,8 +7025,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -7244,8 +7039,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/reinforced, /obj/machinery/alarm{ @@ -7291,8 +7085,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -7328,8 +7121,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7363,8 +7155,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -7402,8 +7193,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -7443,8 +7233,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7458,8 +7247,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -7473,8 +7261,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -7488,8 +7275,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -7508,8 +7294,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7528,8 +7313,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance{ @@ -7552,8 +7336,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7570,8 +7353,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7589,8 +7371,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7608,8 +7389,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7626,8 +7406,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ @@ -7646,8 +7425,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -7824,8 +7602,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /obj/structure/sign/nosmoking_2{ @@ -7877,14 +7654,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/greengrid, /area/engine/controlroom) @@ -7898,16 +7673,13 @@ /obj/structure/table/wood, /obj/item/camera_film, /obj/effect/decal/cleanable/cobweb2, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/fore) "ayi" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8056,8 +7828,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -8098,8 +7869,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance"; @@ -8185,8 +7955,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -8226,8 +7995,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8276,14 +8044,10 @@ /area/maintenance/fore) "azd" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/fore) "aze" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/fore) "azf" = ( /obj/structure/disposalpipe/segment{ @@ -8303,8 +8067,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8339,8 +8102,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -8438,8 +8200,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -8493,8 +8254,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -8665,8 +8425,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/radiation/preopen{ id_tag = "engsm" @@ -8687,8 +8446,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8789,8 +8547,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -8835,9 +8592,7 @@ "aAo" = ( /obj/structure/table/wood, /obj/item/camera, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/fore) "aAp" = ( /obj/structure/chair/comfy/brown{ @@ -8884,8 +8639,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -8989,8 +8743,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9009,8 +8762,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9026,8 +8778,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -9038,8 +8789,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock{ name = "Auxillary Restrooms" @@ -9056,8 +8806,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -9075,8 +8824,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -9217,7 +8965,7 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aBa" = ( -/obj/machinery/conveyor/north{ +/obj/machinery/conveyor/south{ id = "QMLoad2" }, /turf/simulated/floor/plating, @@ -9235,8 +8983,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/door/poddoor/shutters/radiation/preopen{ @@ -9273,7 +9020,9 @@ "aBj" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -9300,8 +9049,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/camera{ c_tag = "Supermatter East"; @@ -9396,9 +9144,7 @@ /obj/structure/table/wood, /obj/item/storage/fancy/crayons, /obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/fore) "aBu" = ( /obj/structure/mirror{ @@ -9418,8 +9164,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9492,8 +9237,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9509,8 +9253,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9519,7 +9262,14 @@ /area/maintenance/fore) "aBE" = ( /obj/structure/disposalpipe/segment, -/obj/structure/table/reinforced, +/obj/machinery/door/window{ + dir = 2; + name = "Bar Door"; + req_access_txt = "25" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -9530,8 +9280,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -9577,8 +9326,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9629,7 +9377,9 @@ "aBU" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -9646,8 +9396,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -9674,8 +9423,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9693,8 +9441,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9711,8 +9458,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -9776,8 +9522,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9802,8 +9547,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock{ name = "Custodial Closet"; @@ -9863,8 +9607,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -9887,8 +9630,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/quartermaster/sorting) @@ -9896,8 +9638,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -9908,8 +9649,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10028,14 +9768,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10051,14 +9789,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10149,8 +9885,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -10244,8 +9979,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -10253,8 +9987,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -10262,8 +9995,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -10273,8 +10005,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -10294,8 +10025,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10309,8 +10039,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -10327,8 +10056,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -10357,8 +10085,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -10424,8 +10151,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10439,8 +10165,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance"; @@ -10455,14 +10180,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -10484,8 +10207,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -10498,8 +10220,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -10512,8 +10233,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -10554,7 +10274,7 @@ }, /area/quartermaster/storage) "aDY" = ( -/obj/machinery/conveyor/northwest{ +/obj/machinery/conveyor/southeast/ccw{ id = "QMLoad2" }, /turf/simulated/floor/plating, @@ -10605,8 +10325,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 8 @@ -10700,8 +10419,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -10743,8 +10461,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -10769,8 +10486,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -10782,8 +10498,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10794,8 +10509,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -10804,8 +10518,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -10832,8 +10545,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -10863,8 +10575,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/closet/crate, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -10878,8 +10589,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10892,8 +10602,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -10915,8 +10624,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10931,8 +10639,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -10970,14 +10677,9 @@ /area/quartermaster/office) "aEO" = ( /obj/machinery/light/small, -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/structure/toilet{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel, /area/crew_quarters/toilet) "aEP" = ( @@ -11007,8 +10709,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11109,8 +10810,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -11122,8 +10822,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/trinary/filter{ dir = 8; @@ -11144,8 +10843,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/visible, /obj/effect/decal/warning_stripes/north, @@ -11164,8 +10862,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -11177,8 +10874,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -11230,8 +10926,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -11293,8 +10988,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11352,8 +11046,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -11374,8 +11067,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11466,8 +11158,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11484,8 +11175,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -11499,8 +11189,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/camera{ @@ -11518,8 +11207,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -11531,8 +11219,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, @@ -11548,8 +11235,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -11600,21 +11286,20 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aGf" = ( +/obj/machinery/conveyor/east{ + id = "QMLoad2" + }, /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor2"; name = "supply dock loading door" }, -/obj/machinery/conveyor/west{ - id = "QMLoad2" - }, /turf/simulated/floor/plating, /area/quartermaster/storage) "aGg" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -11647,8 +11332,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -11656,8 +11340,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -11665,8 +11348,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11677,8 +11359,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11750,12 +11431,12 @@ /obj/item/radio/intercom{ pixel_y = 28 }, -/obj/structure/reagent_dispensers/beerkeg, /obj/machinery/firealarm{ dir = 8; pixel_x = -26; pixel_y = 28 }, +/obj/machinery/bottler, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -11815,7 +11496,6 @@ pixel_x = 26; pixel_y = 26 }, -/obj/item/gun/projectile/revolver/doublebarrel, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -11928,8 +11608,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -11976,10 +11655,10 @@ /turf/simulated/floor/plating, /area/quartermaster/sorting) "aGP" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/west{ +/obj/machinery/conveyor/east{ id = "QMLoad2" }, +/obj/structure/plasticflaps/mining, /turf/simulated/floor/plating, /area/quartermaster/storage) "aGQ" = ( @@ -12005,8 +11684,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/seed_extractor, /turf/simulated/floor/plasteel, @@ -12015,8 +11693,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -12024,8 +11701,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -12070,8 +11746,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12127,8 +11802,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12145,14 +11819,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -12176,8 +11848,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -12229,8 +11900,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -12265,8 +11935,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ @@ -12330,8 +11999,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -12363,8 +12031,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12440,21 +12107,16 @@ }, /area/crew_quarters/bar) "aHS" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; name = "Bar Junction"; - sortType = 4 + sortType = 19 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -12488,8 +12150,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -12498,8 +12159,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -12513,8 +12173,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -12564,10 +12223,6 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 32 - }, /obj/structure/chair/sofa/left, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -12618,24 +12273,17 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aIg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/door/poddoor{ + id_tag = "justice_blast"; + name = "Justice Blast Door" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/effect/decal/warning_stripes/south, +/obj/effect/decal/warning_stripes/north, +/obj/structure/grille{ + layer = 2.69 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) +/turf/simulated/floor/plasteel, +/area/security/execution) "aIh" = ( /obj/machinery/conveyor/southeast{ id = "cargodelivery" @@ -12643,26 +12291,26 @@ /turf/simulated/floor/plating, /area/quartermaster/office) "aIi" = ( -/obj/machinery/conveyor/northeast{ +/obj/machinery/conveyor/southwest/ccw{ id = "QMLoad" }, /turf/simulated/floor/plating, /area/quartermaster/storage) "aIj" = ( +/obj/machinery/conveyor/west{ + id = "QMLoad" + }, /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor"; name = "supply dock loading door" }, -/obj/machinery/conveyor/east{ - id = "QMLoad" - }, /turf/simulated/floor/plating, /area/quartermaster/storage) "aIk" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/east{ +/obj/machinery/conveyor/west{ id = "QMLoad" }, +/obj/structure/plasticflaps/mining, /turf/simulated/floor/plating, /area/quartermaster/storage) "aIl" = ( @@ -12680,8 +12328,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12722,8 +12369,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/camera{ c_tag = "Port Fore Solars"; @@ -12814,8 +12460,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -12850,8 +12495,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -12860,8 +12504,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -12870,8 +12513,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light, /obj/machinery/status_display{ @@ -12884,8 +12526,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/firealarm{ dir = 1; @@ -12898,8 +12539,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, @@ -12908,14 +12548,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12925,8 +12563,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, @@ -12935,8 +12572,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light, /obj/effect/decal/warning_stripes/south, @@ -12951,8 +12587,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -12961,8 +12596,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -13009,8 +12643,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -13041,8 +12674,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -13064,8 +12696,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -13101,10 +12732,10 @@ }, /area/crew_quarters/bar) "aIY" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -13153,8 +12784,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -13169,8 +12799,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -13181,8 +12810,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -13221,6 +12849,9 @@ /area/quartermaster/storage) "aJm" = ( /obj/effect/decal/warning_stripes/north, +/obj/structure/extinguisher_cabinet{ + pixel_x = -25 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aJn" = ( @@ -13267,8 +12898,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/visible, /obj/effect/decal/warning_stripes/north, @@ -13346,7 +12976,7 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aJE" = ( -/obj/machinery/conveyor/north{ +/obj/machinery/conveyor/south{ id = "QMLoad" }, /turf/simulated/floor/plating, @@ -13413,8 +13043,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarport) @@ -13441,8 +13070,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarport) @@ -13455,8 +13083,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -13466,8 +13093,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/northwest, @@ -13477,8 +13103,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/binary/pump{ name = "Gas to Turbine" @@ -13490,8 +13115,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/decal/warning_stripes/north, @@ -13501,14 +13125,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/decal/warning_stripes/north, @@ -13570,8 +13192,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -13598,8 +13219,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/engine/controlroom) @@ -13607,8 +13227,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -13652,8 +13271,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -13664,8 +13282,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13679,8 +13296,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13698,14 +13314,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13722,18 +13336,14 @@ "aKh" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aKi" = ( /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aKj" = ( /obj/machinery/status_display{ @@ -13741,21 +13351,17 @@ }, /obj/structure/bed, /obj/item/bedsheet/orange, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aKk" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "aKl" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aKm" = ( /obj/item/radio/intercom{ @@ -13790,21 +13396,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarport) "aKp" = ( /obj/structure/table/wood, -/obj/item/wrench, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/cable_coil/random{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/stack/cable_coil/random, +/obj/item/gun/projectile/revolver/doublebarrel, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -13848,8 +13446,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -13887,8 +13484,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -13903,16 +13499,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/quartermaster/office) -"aKA" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "aKB" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -13921,9 +13507,12 @@ }, /area/quartermaster/storage) "aKC" = ( -/obj/structure/disposalpipe/junction, /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{ icon_state = "white" }, @@ -14004,8 +13593,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -14045,8 +13633,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -14155,8 +13742,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -14167,8 +13753,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -14190,8 +13775,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -14203,14 +13787,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -14231,8 +13813,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -14246,8 +13827,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -14291,8 +13871,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/firealarm{ dir = 8; @@ -14349,8 +13928,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -14365,9 +13943,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLF" = ( /obj/structure/chair/office/dark{ @@ -14376,17 +13952,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -14395,9 +13967,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLI" = ( /obj/machinery/door/airlock/maintenance{ @@ -14409,9 +13979,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -14452,7 +14020,15 @@ /area/crew_quarters/bar) "aLN" = ( /obj/machinery/light, -/obj/machinery/vending/bardrobe, +/obj/structure/closet/gmcloset, +/obj/item/wrench, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/cable_coil/random{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -14498,7 +14074,7 @@ name = "Civilian" }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aLT" = ( @@ -14566,8 +14142,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14589,7 +14164,6 @@ }, /area/quartermaster/office) "aMb" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11 @@ -14598,6 +14172,12 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -14676,6 +14256,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/mob/living/carbon/human/monkey/punpun, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -14718,8 +14299,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/stool, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -14735,6 +14315,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -14785,9 +14370,7 @@ "aMD" = ( /obj/structure/dresser, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aME" = ( /obj/structure/cable{ @@ -14873,8 +14456,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14908,8 +14490,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -14960,8 +14541,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -14972,9 +14552,7 @@ "aNa" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aNb" = ( /obj/effect/decal/warning_stripes/yellow/hollow, @@ -14989,15 +14567,11 @@ "aNc" = ( /obj/machinery/light, /obj/structure/closet/wardrobe/mixed, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aNd" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aNe" = ( /obj/structure/closet/emcloset, @@ -15019,8 +14593,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 8; @@ -15039,7 +14612,7 @@ pixel_x = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aNj" = ( @@ -15052,7 +14625,7 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aNk" = ( @@ -15081,8 +14654,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -15120,8 +14692,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -15176,8 +14747,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -15237,8 +14807,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -15252,8 +14821,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15271,8 +14839,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15287,20 +14854,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -15310,8 +14874,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15332,8 +14895,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/security/permabrig) @@ -15347,8 +14909,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -15356,8 +14917,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15476,9 +15036,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "aNY" = ( /obj/machinery/atmospherics/pipe/manifold/visible, @@ -15516,7 +15074,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aOd" = ( @@ -15524,8 +15082,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -15593,8 +15150,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -15660,16 +15216,13 @@ /area/maintenance/gambling_den) "aOu" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aOv" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -15749,7 +15302,7 @@ /area/crew_quarters/bar) "aOG" = ( /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aOH" = ( @@ -15815,8 +15368,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -15828,7 +15380,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aOR" = ( @@ -15873,8 +15425,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/paper, @@ -15996,8 +15547,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/igniter{ id = "Incinerator"; @@ -16009,8 +15559,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/glass{ autoclose = 0; @@ -16027,8 +15576,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/engine, /area/maintenance/incinerator) @@ -16036,8 +15584,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/glass{ autoclose = 0; @@ -16054,8 +15601,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -16066,8 +15612,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -16094,7 +15639,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aPv" = ( @@ -16145,8 +15690,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, @@ -16256,13 +15800,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aPO" = ( /obj/machinery/light/small{ @@ -16351,9 +15892,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aPW" = ( /turf/simulated/floor/carpet, @@ -16362,8 +15901,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, @@ -16377,18 +15915,11 @@ icon_state = "grimy" }, /area/crew_quarters/bar/atrium) -"aPZ" = ( -/obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark" - }, -/area/crew_quarters/bar) "aQb" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aQc" = ( @@ -16401,14 +15932,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aQd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/cans/cola, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aQe" = ( @@ -16433,8 +15964,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/office/dark{ dir = 8 @@ -16454,14 +15984,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -16514,8 +16042,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -16539,9 +16066,10 @@ }, /area/quartermaster/storage) "aQo" = ( -/obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop, -/turf/simulated/floor/wood, +/obj/structure/chair/comfy/lime{ + dir = 4 + }, +/turf/simulated/floor/carpet, /area/medical/psych) "aQp" = ( /obj/machinery/door/firedoor, @@ -16563,9 +16091,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aQr" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -16580,7 +16106,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/conveyor/northeast/ccw{ +/obj/machinery/conveyor/southwest{ id = "QMLoad" }, /turf/simulated/floor/plating, @@ -16591,7 +16117,7 @@ }, /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aQu" = ( @@ -16649,8 +16175,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/deck/cards, @@ -16860,13 +16385,13 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "caution" @@ -16880,13 +16405,11 @@ }, /area/atmos) "aRa" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/shower{ - dir = 4 + pixel_x = -22 }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/wardrobe/atmospherics_yellow, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aRb" = ( @@ -16944,7 +16467,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRf" = ( @@ -17022,22 +16545,17 @@ }, /area/maintenance/gambling_den) "aRm" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aRn" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/stool, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aRo" = ( /obj/machinery/slot_machine, @@ -17068,8 +16586,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" @@ -17083,7 +16600,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRt" = ( @@ -17098,14 +16615,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -17117,8 +16632,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -17145,7 +16659,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRy" = ( @@ -17173,7 +16687,7 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/cheesiehonkers, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRD" = ( @@ -17181,14 +16695,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRE" = ( /obj/structure/table/wood, /obj/item/deck/cards, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRH" = ( @@ -17244,8 +16758,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17283,8 +16796,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -17302,8 +16814,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17311,6 +16822,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "white" @@ -17452,8 +16966,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17502,7 +17015,7 @@ }, /area/security/execution) "aSw" = ( -/obj/machinery/conveyor/east{ +/obj/machinery/conveyor/west{ id = "QMLoad" }, /turf/simulated/floor/plating, @@ -17602,8 +17115,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -17683,8 +17195,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17692,16 +17203,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "aSS" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -17718,8 +17226,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -17733,8 +17240,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17752,8 +17258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17768,8 +17273,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -17788,8 +17292,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17804,8 +17307,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -17826,8 +17328,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -17851,14 +17352,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -17883,8 +17382,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -17896,8 +17394,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -17908,8 +17405,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -17949,7 +17445,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aTi" = ( @@ -17968,8 +17464,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -17988,8 +17483,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18011,7 +17505,7 @@ "aTp" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aTq" = ( @@ -18067,8 +17561,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -18186,8 +17679,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/glass{ name = "Prison" @@ -18232,8 +17724,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -18252,6 +17743,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/door_control{ + id = "justice_blast"; + name = "Space Vent"; + pixel_y = 34; + req_access_txt = "2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -18266,8 +17763,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18284,8 +17780,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18306,8 +17801,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/closet/secure_closet/injection, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -18359,8 +17853,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18480,8 +17973,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -18552,7 +18044,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUk" = ( @@ -18593,7 +18085,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUp" = ( @@ -18621,8 +18113,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -18630,8 +18121,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, @@ -18641,14 +18131,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -18662,7 +18150,7 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUx" = ( @@ -18707,7 +18195,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUC" = ( @@ -18725,8 +18213,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -18772,7 +18259,7 @@ "aUI" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUJ" = ( @@ -18781,7 +18268,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUL" = ( @@ -18790,7 +18277,7 @@ icon_state = "pipe-y" }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUM" = ( @@ -18810,6 +18297,14 @@ layer = 3.3; pixel_x = -27 }, +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/item/stack/sheet/glass{ + amount = 50; + pixel_x = 3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -18829,8 +18324,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18843,8 +18337,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -18909,8 +18402,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -18934,8 +18426,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 8 @@ -19005,8 +18496,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/office/dark{ dir = 4 @@ -19094,8 +18584,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19182,8 +18671,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/dark{ @@ -19209,8 +18697,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -19372,8 +18859,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -19389,8 +18875,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -19414,7 +18899,7 @@ }, /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aVR" = ( @@ -19519,8 +19004,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -19545,7 +19029,7 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aWh" = ( @@ -19554,26 +19038,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aWi" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/britcup, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aWj" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aWk" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aWl" = ( @@ -19596,8 +19080,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -19655,8 +19138,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -19667,8 +19149,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -19684,8 +19165,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -19701,8 +19181,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -19718,8 +19197,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -19730,8 +19208,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -19748,8 +19225,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19771,8 +19247,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -19791,14 +19266,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19830,8 +19303,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19851,8 +19323,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19873,8 +19344,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19993,8 +19463,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -20031,8 +19500,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -20276,8 +19744,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -20340,8 +19807,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/maintenance/fore) @@ -20367,14 +19833,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -20443,7 +19907,7 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aXI" = ( @@ -20451,15 +19915,14 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aXJ" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -20500,8 +19963,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -20557,15 +20019,14 @@ }, /area/atmos) "aXX" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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 = 8; icon_state = "neutralfull" @@ -20575,8 +20036,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -20587,11 +20047,11 @@ }, /area/hallway/primary/central) "aXZ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -20599,7 +20059,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20607,6 +20066,9 @@ /area/hallway/primary/fore) "aYa" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/radio/intercom{ + pixel_y = 28 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -20631,8 +20093,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -20737,8 +20198,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/security/glass{ @@ -20763,14 +20223,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ - name = "Execution Room"; - req_access = null; + name = "Prisoner Re-education Centre"; req_access_txt = "1" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20998,8 +20456,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -21017,8 +20474,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21042,14 +20498,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/sortjunction{ @@ -21066,8 +20520,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ @@ -21081,8 +20534,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -21096,8 +20548,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21118,8 +20569,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark{ name = "lightsout" @@ -21149,7 +20599,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aZc" = ( @@ -21162,7 +20612,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aZd" = ( @@ -21176,20 +20626,13 @@ }, /area/hallway/primary/fore) "aZe" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "dark" }, -/area/hallway/primary/fore) +/area/bridge) "aZf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -21355,8 +20798,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -21438,8 +20880,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21472,14 +20913,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -21489,14 +20928,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21508,8 +20945,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -21527,8 +20963,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door_control{ desc = "A remote control-switch to lock down the prison wing's blast doors"; @@ -21549,8 +20984,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/status_display{ pixel_y = 32 @@ -21563,8 +20997,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21583,14 +21016,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/status_display{ pixel_y = 32 @@ -21603,8 +21034,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -21621,14 +21051,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/flasher_button{ id = "Cell 2"; @@ -21649,14 +21077,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/status_display{ pixel_y = 32 @@ -21673,14 +21099,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/firealarm{ pixel_y = 24 @@ -21706,14 +21130,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; @@ -21733,8 +21155,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -21755,9 +21176,8 @@ dir = 4; pixel_x = 28 }, -/obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "baa" = ( @@ -21785,8 +21205,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -21817,8 +21236,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -21850,8 +21268,8 @@ dir = 8 }, /obj/machinery/atmospherics/trinary/filter{ - filter_type = "co2"; - name = "co2 filter"; + filter_type = 3; + name = "Gas filter (CO2 tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -21904,8 +21322,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22036,8 +21453,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22050,8 +21466,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; @@ -22096,8 +21511,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, @@ -22156,7 +21570,7 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "baS" = ( @@ -22176,7 +21590,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "baU" = ( @@ -22305,8 +21719,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ @@ -22335,8 +21748,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -22403,8 +21815,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -22423,8 +21834,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22439,8 +21849,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22462,14 +21871,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -22486,8 +21893,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -22530,8 +21936,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22766,8 +22171,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Life Support Specialist" @@ -22840,8 +22244,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/segment, @@ -22872,8 +22275,10 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bci" = ( +/obj/item/radio/intercom{ + pixel_y = 28 + }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/vending/hydrodrobe, /turf/simulated/floor/plasteel, /area/hydroponics) "bcj" = ( @@ -22881,9 +22286,6 @@ /obj/item/wrench, /obj/item/clothing/suit/apron, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/radio/intercom{ - pixel_y = 28 - }, /turf/simulated/floor/plasteel, /area/hydroponics) "bck" = ( @@ -22921,8 +22323,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -22998,16 +22399,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/bar) "bcx" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/condiment/saltshaker, -/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/door/firedoor, -/obj/machinery/door/window{ - dir = 2; +/obj/machinery/door/airlock/public/glass{ name = "Kitchen"; req_access_txt = "28" }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bcy" = ( @@ -23031,8 +22427,8 @@ }, /area/atmos) "bcz" = ( +/obj/structure/closet/chefcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/vending/chefdrobe, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -23145,7 +22541,6 @@ pixel_y = -27 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/vending/cargodrobe, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -23206,8 +22601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -23242,8 +22636,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ @@ -23254,8 +22647,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -23307,8 +22699,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/restraints/handcuffs, @@ -23419,8 +22810,8 @@ /obj/structure/window/reinforced, /obj/machinery/atmospherics/trinary/filter{ dir = 1; - filter_type = "o2"; - name = "oxygen filter"; + filter_type = 1; + name = "Gas filter (O2 tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -23476,8 +22867,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -23491,8 +22881,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23506,14 +22895,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23527,8 +22914,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -23545,8 +22931,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23563,8 +22948,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23579,8 +22963,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/glass{ name = "Hydroponics"; @@ -23598,14 +22981,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -23640,8 +23021,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/freezer{ req_access_txt = "28" @@ -23660,8 +23040,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23678,8 +23057,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23695,8 +23073,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark/start{ name = "Chef" @@ -23712,8 +23089,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -23758,11 +23134,18 @@ }, /area/crew_quarters/kitchen) "bdR" = ( -/obj/structure/sink/kitchen{ - pixel_y = 30 +/obj/structure/table/reinforced, +/obj/machinery/door/window{ + dir = 2; + name = "Kitchen"; + req_access_txt = "28" }, +/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + icon_state = "bar" }, /area/crew_quarters/kitchen) "bdS" = ( @@ -23781,7 +23164,9 @@ req_access_txt = "28" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, /area/crew_quarters/kitchen) "bdU" = ( /turf/simulated/wall, @@ -23918,8 +23303,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -23979,8 +23363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -23994,8 +23377,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, @@ -24114,11 +23496,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/closet/wardrobe/atmospherics_yellow, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/fireaxecabinet{ pixel_x = 30 }, -/obj/machinery/vending/atmosdrobe, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -24242,8 +23624,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24330,7 +23711,9 @@ req_access_txt = "28" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, /area/crew_quarters/kitchen) "bfm" = ( /obj/machinery/kitchen_machine/oven, @@ -24354,7 +23737,9 @@ req_access_txt = "28" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, /area/crew_quarters/kitchen) "bfp" = ( /obj/machinery/door/firedoor, @@ -24399,8 +23784,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ @@ -24436,8 +23820,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -24490,8 +23873,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -24561,20 +23943,14 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bfR" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; pixel_x = -24 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitered" @@ -24616,14 +23992,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, @@ -24634,8 +24008,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -24644,8 +24017,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/door/airlock/security{ @@ -24666,8 +24038,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/closet/l3closet/security, /obj/effect/decal/cleanable/dirt, @@ -24693,8 +24064,7 @@ dir = 8 }, /obj/machinery/atmospherics/trinary/filter{ - filter_type = "plasma"; - name = "waste filter"; + name = "Gas filter (Toxins tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -24837,8 +24207,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -24876,8 +24245,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -25016,8 +24384,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -25069,8 +24436,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -25140,12 +24506,6 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/storage/belt/medical, /obj/item/clothing/glasses/hud/health, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitered" @@ -25156,25 +24516,38 @@ pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitered" }, /area/security/medbay) "bhd" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 24 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" }, /area/security/medbay) "bhf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/photocopier/faxmachine/longrange{ department = "Magistrate's Office" }, /obj/structure/table/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -25183,8 +24556,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -25298,9 +24670,7 @@ }, /area/atmos) "bhr" = ( -/obj/machinery/atmospherics/binary/valve/open{ - name = "SM Coolant loop" - }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -25409,8 +24779,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25448,19 +24817,25 @@ }, /area/storage/primary) "bhK" = ( -/obj/item/radio/intercom{ - pixel_y = 28 +/obj/structure/sink/kitchen{ + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/crew_quarters/kitchen) "bhL" = ( -/mob/living/carbon/human/monkey/punpun, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +/obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/crew_quarters/kitchen) +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "bhN" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/flour, @@ -25479,8 +24854,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -25635,8 +25009,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25653,8 +25026,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25685,8 +25057,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -25708,8 +25079,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -25727,14 +25097,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25844,15 +25212,9 @@ dir = 4 }, /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -25882,8 +25244,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25921,14 +25282,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -25940,8 +25299,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/alarm{ pixel_y = 24 @@ -25956,8 +25314,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light{ dir = 1; @@ -25977,8 +25334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/newscaster{ pixel_y = 32 @@ -25995,7 +25351,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/vending/secdrobe, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -26050,14 +25406,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 2; @@ -26270,8 +25624,8 @@ /obj/structure/window/reinforced, /obj/machinery/atmospherics/trinary/filter{ dir = 1; - filter_type = "n2"; - name = "nitrogen filter"; + filter_type = 2; + name = "Gas filter (N2 tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -26312,8 +25666,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -26414,8 +25767,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -26437,7 +25789,7 @@ /area/crew_quarters/sleep) "bjp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/airlock/public/glass{ name = "Kitchen"; req_access_txt = "28" }, @@ -26520,8 +25872,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26547,7 +25898,9 @@ /area/hallway/primary/fore) "bjD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +/obj/machinery/door/airlock/glass{ + name = "Primary tool storage" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -26585,8 +25938,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -26614,8 +25966,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -26677,8 +26028,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -26691,8 +26041,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -26710,23 +26059,12 @@ /obj/item/clothing/gloves/color/latex, /obj/item/healthanalyzer, /obj/item/reagent_containers/spray/cleaner, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitered" }, /area/security/medbay) "bka" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -26734,6 +26072,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -26751,6 +26098,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -26784,6 +26134,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" @@ -26793,8 +26146,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -26807,6 +26159,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -26816,14 +26172,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26831,14 +26185,24 @@ }, /area/security/brig) "bkf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access_txt = "19" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" + dir = 8; + icon_state = "vault" }, -/area/security/brig) +/area/bridge) "bkg" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, @@ -26859,8 +26223,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26944,8 +26307,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/taperecorder, @@ -27064,8 +26426,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -27074,8 +26435,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -27086,8 +26446,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -27096,8 +26455,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, @@ -27106,14 +26464,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27127,8 +26483,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, @@ -27158,7 +26513,9 @@ }, /area/atmos) "bkP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/binary/valve{ + name = "SM coolant loop" + }, /obj/machinery/light/small{ dir = 4 }, @@ -27234,8 +26591,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27251,8 +26607,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -27334,12 +26689,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) -"blp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) "blq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -27419,8 +26768,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27566,8 +26914,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -27632,14 +26979,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -27690,6 +27035,7 @@ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -27699,8 +27045,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -27732,8 +27077,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/office/dark{ dir = 4 @@ -27766,9 +27110,6 @@ }, /area/security/main) "bmd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, @@ -27810,8 +27151,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -27942,8 +27282,8 @@ dir = 8 }, /obj/machinery/atmospherics/trinary/filter{ - filter_type = "n2o"; - name = "n2o filter"; + filter_type = 4; + name = "Gas filter (N2O tank)"; on = 1 }, /turf/simulated/floor/plasteel{ @@ -28040,8 +27380,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -28139,9 +27478,9 @@ /turf/simulated/floor/plating, /area/atmos) "bmO" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -28223,8 +27562,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -28375,8 +27713,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/security/prisonershuttle) @@ -28392,35 +27729,27 @@ }, /area/security/brig) "bnq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/security/brig) +/area/security/medbay) "bnr" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28428,12 +27757,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, /area/security/brig) "bnt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -28443,6 +27772,7 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -28452,14 +27782,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -28493,8 +27821,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -28520,8 +27847,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -28667,8 +27993,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28780,8 +28105,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28868,8 +28192,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -28964,8 +28287,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28986,11 +28308,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -28998,6 +28316,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -29011,8 +28332,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29023,8 +28343,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment, @@ -29050,11 +28369,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Mining Maintenance"; @@ -29069,15 +28384,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/filingcabinet/filingcabinet, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -29095,9 +28408,7 @@ }, /area/security/prisonershuttle) "boN" = ( -/obj/machinery/computer/security{ - network = list("SS13","Mining Outpost") - }, +/obj/machinery/computer/security, /obj/item/radio/intercom{ pixel_y = 28 }, @@ -29135,26 +28446,19 @@ }, /area/security/prisonershuttle) "boR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "boS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -29165,24 +28469,19 @@ }, /area/security/brig) "boT" = ( -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "red" + icon_state = "vault" }, -/area/security/main) +/area/bridge) "boU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/office/dark{ dir = 4 @@ -29197,9 +28496,6 @@ }, /area/security/main) "boV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel{ @@ -29213,8 +28509,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 9; @@ -29222,9 +28517,6 @@ }, /area/security/prisonershuttle) "boX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, /turf/simulated/floor/plasteel{ @@ -29233,9 +28525,6 @@ }, /area/security/main) "boY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 8; @@ -29243,44 +28532,39 @@ }, /area/security/main) "boZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/main) "bpa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/main) "bpb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -29290,62 +28574,57 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/command/glass{ name = "Head of Security"; req_access_txt = "58" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -29355,26 +28634,24 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/wood, /obj/item/folder/red, /obj/item/stamp/hos, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/brown{ dir = 8 @@ -29382,20 +28659,22 @@ /obj/effect/landmark/start{ name = "Head of Security" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpg" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -29405,8 +28684,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -29417,8 +28695,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -29428,8 +28705,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/command/glass{ name = "Head of Security"; @@ -29443,8 +28719,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -29454,8 +28729,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ @@ -29472,8 +28746,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; @@ -29706,8 +28979,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -29786,8 +29058,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/light/small{ dir = 1 @@ -29805,8 +29076,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29820,8 +29090,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ @@ -29833,8 +29102,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -29846,8 +29114,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29861,8 +29128,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -29877,8 +29143,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -29891,8 +29156,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29903,8 +29167,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -29920,8 +29183,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ dir = 8; @@ -29986,14 +29248,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -30023,8 +29283,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -30048,13 +29307,12 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "bqs" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall2"; @@ -30099,8 +29357,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -30112,15 +29369,15 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + dir = 8; + icon_state = "bluecorner" }, /area/hallway/primary/central) "bqx" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -30149,14 +29406,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -30197,9 +29452,6 @@ /turf/simulated/wall/rust, /area/maintenance/starboard) "bqJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -30211,8 +29463,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) @@ -30241,34 +29492,28 @@ }, /area/security/prisonershuttle) "bqQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "bqR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30276,20 +29521,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/brig) "bqS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30297,20 +29542,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/brig) "bqT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30322,8 +29566,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -30334,28 +29577,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull"; tag = null }, /area/security/main) "bqU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -30368,8 +29613,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -30392,8 +29636,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30418,8 +29661,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30435,8 +29677,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30455,6 +29696,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -30477,8 +29719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -30493,8 +29734,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -30524,8 +29764,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -30541,9 +29780,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/computer/security{ - network = list("SS13","Mining Outpost") - }, +/obj/machinery/computer/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -30552,13 +29789,13 @@ }, /area/security/hos) "bri" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -30661,9 +29898,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "bru" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -30673,9 +29908,7 @@ "brv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "brw" = ( /obj/structure/lattice, @@ -30706,8 +29939,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -30873,8 +30105,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi3"; @@ -30903,8 +30134,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -30968,18 +30198,20 @@ }, /area/hallway/primary/central) "bsg" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + dir = 8; + icon_state = "neutralfull" }, /area/hallway/primary/central) "bsh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -31077,8 +30309,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -31097,41 +30328,36 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bsD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bsE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/phone, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31140,20 +30366,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31161,26 +30386,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/prisonershuttle) "bsH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/security/glass{ name = "Labor Camp Office"; @@ -31193,20 +30416,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/security/prisonershuttle) "bsI" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -31214,6 +30435,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Brig Physisian Junction"; + sortType = 24 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -31229,6 +30455,7 @@ req_access_txt = "63"; req_one_access_txt = null }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31255,8 +30482,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -31266,8 +30492,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -31319,8 +30544,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/computer/shuttle/labor, @@ -31485,14 +30709,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -31506,8 +30728,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -31519,8 +30740,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -31536,8 +30756,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -31549,8 +30768,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -31563,8 +30781,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -31603,14 +30820,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -31664,8 +30879,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -31680,8 +30894,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -31715,14 +30928,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -31760,23 +30971,21 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btU" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/window/brigdoor{ dir = 1 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btV" = ( @@ -31802,8 +31011,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -31818,14 +31026,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/north, /obj/machinery/door/window/brigdoor{ @@ -31854,24 +31060,24 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/security/prisonershuttle) "bub" = ( -/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, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Captain's Junction"; + sortType = 18 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "neutralcorner" }, -/area/security/brig) +/area/hallway/primary/central) "buc" = ( /turf/simulated/wall, /area/security/interrogation) @@ -31922,6 +31128,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31974,8 +31181,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -31994,15 +31200,15 @@ }, /area/security/hos) "bun" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/machinery/light, /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -32128,8 +31334,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -32172,8 +31377,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -32192,8 +31396,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -32236,8 +31439,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -32275,14 +31477,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 2; @@ -32350,14 +31550,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -32366,8 +31564,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32407,6 +31604,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/structure/closet/secure_closet/freezer/money, /turf/simulated/floor/greengrid, /area/security/nuke_storage) "bvf" = ( @@ -32423,12 +31621,19 @@ }, /area/security/nuke_storage) "bvg" = ( -/obj/structure/closet/secure_closet/freezer/money, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/security/nuke_storage) +/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) "bvh" = ( /obj/structure/lattice, /obj/structure/grille, @@ -32438,14 +31643,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/window/reinforced{ dir = 1; @@ -32454,13 +31657,12 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvn" = ( @@ -32473,12 +31675,14 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32487,8 +31691,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -32496,6 +31699,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32504,12 +31710,14 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -32520,13 +31728,15 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32556,8 +31766,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -32568,19 +31777,25 @@ dir = 8 }, /obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/interrogation) "bvx" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/button/windowtint{ id = 1; pixel_x = 25 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32609,8 +31824,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -32620,8 +31834,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -32634,8 +31847,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -32721,16 +31933,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "bvM" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -32772,8 +31981,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -32793,8 +32001,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -32808,8 +32015,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/window{ base_state = "right"; @@ -32837,8 +32043,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/plasticflaps{ opacity = 1 @@ -32879,8 +32084,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/rack, /obj/item/circuitboard/robotics{ @@ -32895,20 +32099,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/rack, /obj/item/circuitboard/communications{ @@ -32927,8 +32128,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/rack, /obj/item/circuitboard/aicore{ @@ -32983,8 +32183,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 4; @@ -33004,8 +32203,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -33029,8 +32227,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/poddoor{ density = 0; @@ -33068,14 +32265,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/poddoor{ density = 0; @@ -33106,8 +32301,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 2; @@ -33131,8 +32325,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/poddoor{ density = 0; @@ -33152,8 +32345,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/poddoor{ density = 0; @@ -33235,19 +32427,17 @@ }, /area/security/nuke_storage) "bwy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -33277,6 +32467,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -33397,9 +32588,6 @@ }, /area/turret_protected/ai) "bwL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -33506,8 +32694,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -33568,8 +32755,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -33644,8 +32830,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ @@ -33675,12 +32860,9 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/computer/security{ - network = list("SS13","Mining Outpost") + icon_state = "1-2" }, +/obj/machinery/computer/security, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -33706,8 +32888,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/station_alert, /turf/simulated/floor/plasteel{ @@ -33739,8 +32920,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Auxiliary Storage"; @@ -33757,8 +32937,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -33776,8 +32955,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33793,8 +32971,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33814,8 +32991,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33831,8 +33007,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33846,8 +33021,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -33862,8 +33036,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/greengrid, /area/security/nuke_storage) @@ -33890,7 +33063,6 @@ }, /area/security/prisonershuttle) "bxK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -33908,6 +33080,7 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -33954,8 +33127,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -34005,8 +33180,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) @@ -34033,8 +33207,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) @@ -34047,8 +33220,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) @@ -34064,8 +33236,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) @@ -34192,8 +33363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -34238,8 +33408,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -34253,8 +33422,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/office/dark{ dir = 4 @@ -34276,8 +33444,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -34308,8 +33475,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 @@ -34338,20 +33504,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage"; @@ -34364,14 +33527,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -34385,8 +33546,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -34398,14 +33558,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -34413,8 +33571,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -34427,7 +33584,9 @@ "byN" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -34437,8 +33596,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34451,14 +33609,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -34503,8 +33659,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/office/dark{ dir = 1 @@ -34530,13 +33685,20 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/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{ - icon_state = "dark" + dir = 8; + icon_state = "neutralfull" }, -/area/bridge) +/area/hallway/primary/fore) "byX" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -34584,8 +33746,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -34631,7 +33792,10 @@ /turf/space, /area/space) "bzg" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -34641,8 +33805,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/light/small{ dir = 1 @@ -34682,18 +33845,15 @@ /turf/simulated/floor/plating, /area/security/brig) "bzm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -34710,8 +33870,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -34727,14 +33886,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -34750,8 +33907,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -34768,8 +33924,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -34860,9 +34015,6 @@ }, /area/engine/gravitygenerator) "bzF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -34960,8 +34112,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -34996,8 +34147,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35068,8 +34218,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 @@ -35115,8 +34264,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -35137,8 +34285,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -35233,8 +34380,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/supplycomp, /turf/simulated/floor/plasteel{ @@ -35246,8 +34392,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -35258,8 +34403,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -35270,8 +34414,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -35301,8 +34444,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/shuttle/mining, /turf/simulated/floor/plasteel{ @@ -35379,8 +34521,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -35390,8 +34531,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -35408,8 +34548,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -35426,14 +34565,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -35475,8 +34612,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -35490,6 +34626,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -35522,14 +34659,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -35672,8 +34807,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -35733,8 +34867,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -35760,14 +34893,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -35830,8 +34961,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -35842,14 +34972,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35927,8 +35055,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -35973,8 +35100,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -36014,8 +35140,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/plasticflaps{ opacity = 1 @@ -36065,8 +35190,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -36119,8 +35243,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36153,8 +35276,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36164,8 +35286,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36194,8 +35315,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36205,8 +35325,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36228,8 +35347,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36245,8 +35363,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -36262,14 +35379,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -36296,8 +35411,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36307,8 +35421,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36327,8 +35440,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36347,8 +35459,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36365,14 +35476,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/door/window/brigdoor/southright{ - req_access_txt = "30" + name = "Captains seat" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36390,8 +35500,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -36403,8 +35512,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36414,8 +35522,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36435,8 +35542,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36444,8 +35550,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36458,8 +35563,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36483,8 +35587,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36503,14 +35606,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -36537,8 +35638,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36554,8 +35654,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36565,8 +35664,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36588,8 +35686,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36606,8 +35703,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36624,14 +35720,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36677,16 +35771,18 @@ /turf/simulated/floor/plating, /area/security/brig) "bCL" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "HoS Junction"; - sortType = 18 +/obj/structure/cable{ + d1 = 1; + 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 = 8; - icon_state = "neutralfull" + icon_state = "darkblue" }, -/area/hallway/primary/starboard) +/area/bridge) "bCM" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -36694,9 +35790,9 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "redcorner" + icon_state = "red" }, -/area/hallway/primary/starboard) +/area/security/brig) "bCN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -36937,8 +36033,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -36957,14 +36052,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -36979,8 +36072,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -36995,8 +36087,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37011,8 +36102,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37027,8 +36117,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37043,8 +36132,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -37064,8 +36152,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -37078,8 +36165,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -37099,8 +36185,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -37113,8 +36198,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37135,8 +36219,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -37156,14 +36239,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -37193,8 +36274,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37205,15 +36285,14 @@ }, /area/hallway/primary/port) "bDD" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" +/obj/structure/chair, +/obj/machinery/camera{ + c_tag = "Psych Foyer" }, -/obj/machinery/light/small{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" }, -/turf/simulated/floor/plating, /area/maintenance/starboard) "bDE" = ( /obj/item/twohanded/required/kirbyplants, @@ -37235,8 +36314,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37296,8 +36374,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 9; @@ -37308,8 +36385,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -37380,8 +36456,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -37427,8 +36502,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37452,8 +36526,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -37470,8 +36543,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -37481,8 +36553,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -37531,8 +36602,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/communications, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -37564,8 +36634,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -37581,11 +36650,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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{ icon_state = "dark" }, @@ -37594,6 +36666,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37602,8 +36677,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -37617,6 +36691,9 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -37648,10 +36725,10 @@ }, /area/hallway/primary/central) "bEr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -37666,15 +36743,17 @@ }, /area/security/brig) "bEw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/camera{ + c_tag = "Security Hallway South"; + dir = 8; + network = list("SS13","Security") }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 4; icon_state = "redcorner" }, -/area/hallway/primary/starboard) +/area/security/brig) "bEx" = ( /turf/simulated/wall/r_wall, /area/security/warden) @@ -37698,8 +36777,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -37770,12 +36848,11 @@ }, /area/engine/gravitygenerator) "bEH" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" }, -/turf/simulated/floor/plating, /area/maintenance/starboard) "bEI" = ( /turf/simulated/floor/plasteel{ @@ -37787,8 +36864,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -37824,8 +36900,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37912,8 +36987,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -37924,8 +36998,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38002,8 +37075,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -38113,8 +37185,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -38219,8 +37290,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/comfy/black{ dir = 1 @@ -38267,8 +37337,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -38300,8 +37369,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -38337,8 +37405,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -38367,8 +37434,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -38400,8 +37466,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/light/small{ dir = 1 @@ -38502,8 +37567,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -38618,8 +37682,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38685,14 +37748,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -38713,8 +37774,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38734,8 +37794,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -38753,8 +37812,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -38779,8 +37837,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -38801,8 +37858,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -38821,8 +37877,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "lightsout" @@ -38845,8 +37900,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -38856,8 +37910,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -38882,8 +37935,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38903,14 +37955,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -38934,14 +37984,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -38989,8 +38037,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -39004,8 +38051,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -39114,14 +38160,10 @@ }, /area/storage/primary) "bHf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -39130,6 +38172,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bHg" = ( @@ -39169,8 +38214,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -39180,9 +38224,7 @@ req_access_txt = "19" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bHm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -39228,8 +38270,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -39305,8 +38346,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -39317,9 +38357,8 @@ req_access_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bHA" = ( /obj/machinery/power/apc{ @@ -39340,20 +38379,17 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39364,8 +38400,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39379,8 +38414,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -39389,8 +38423,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -39399,8 +38432,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -39418,8 +38450,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) @@ -39427,8 +38458,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -39436,10 +38466,12 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "bHJ" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/toy/figure/crew/detective, /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/machinery/vending/detdrobe, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39448,8 +38480,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/closet/secure_closet/detective, /turf/simulated/floor/plasteel{ @@ -39481,24 +38512,32 @@ /obj/structure/table/wood, /obj/item/taperecorder, /obj/item/restraints/handcuffs, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/detectives_office) "bHN" = ( /obj/structure/filingcabinet/security, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/detectives_office) "bHO" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39550,19 +38589,21 @@ }, /area/hallway/primary/starboard) "bHU" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ +/obj/structure/disposalpipe/segment{ dir = 4; - icon_state = "redcorner" + icon_state = "pipe-c" }, -/area/hallway/primary/starboard) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "red" + }, +/area/security/brig) "bHV" = ( /obj/effect/decal/warning_stripes/east, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -39570,8 +38611,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -39582,14 +38622,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -39625,8 +38663,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -39638,18 +38675,20 @@ }, /area/security/brig) "bHZ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Security Junction"; + sortType = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39851,8 +38890,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39964,8 +39002,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40025,7 +39062,9 @@ /area/storage/primary) "bIV" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +/obj/machinery/door/airlock/glass{ + name = "Primary tool storage" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -40045,32 +39084,24 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bIZ" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJa" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJb" = ( /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJc" = ( /obj/structure/cable{ @@ -40082,9 +39113,7 @@ name = "north bump"; pixel_y = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40104,34 +39133,26 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJg" = ( /obj/structure/table/wood, /obj/item/paicard, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bJi" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -40147,80 +39168,67 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/figure/crew/captain, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJk" = ( /obj/machinery/light_switch{ pixel_x = 8; pixel_y = 26 }, -/obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/disposalpipe/trunk{ + dir = 4 }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJl" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJm" = ( /obj/machinery/light{ dir = 1; in_use = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJn" = ( /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJo" = ( /obj/machinery/ai_status_display{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJp" = ( /obj/structure/sign/bobross{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJq" = ( /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJr" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bJs" = ( /obj/machinery/computer/security/mining, @@ -40243,8 +39251,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Detective Maintenance"; @@ -40256,8 +39263,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40272,8 +39278,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -40286,8 +39291,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40300,30 +39304,27 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) "bJz" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -40462,8 +39463,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -40587,8 +39587,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40659,8 +39658,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40679,8 +39677,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -40690,8 +39687,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -40713,8 +39709,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40734,8 +39729,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40755,14 +39749,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -40770,7 +39762,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/sortjunction{ name = "CE's Junction"; sortType = 5 @@ -40786,21 +39777,6 @@ icon_state = "yellow" }, /area/engine/break_room) -"bKt" = ( -/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" - }, -/area/hallway/primary/central) "bKu" = ( /obj/structure/rack, /obj/item/circuitboard/teleporter_hub{ @@ -40818,15 +39794,6 @@ icon_state = "neutralfull" }, /area/storage/tech) -"bKv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "bKw" = ( /obj/structure/sign/electricshock, /turf/simulated/wall, @@ -40866,8 +39833,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -40882,9 +39848,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bKD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -40912,8 +39875,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/cigar{ @@ -40931,9 +39893,7 @@ pixel_y = -4; req_one_access_txt = "18" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bKG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -40979,8 +39939,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) @@ -40989,14 +39948,10 @@ pixel_x = -8; pixel_y = -26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bKN" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bKO" = ( /obj/machinery/vending/coffee, @@ -41027,8 +39982,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -41066,20 +40020,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLa" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -41087,26 +40034,16 @@ /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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLc" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLd" = ( /obj/structure/chair/comfy/brown{ @@ -41115,33 +40052,25 @@ /obj/effect/landmark/start{ name = "Captain" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLe" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLf" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLg" = ( /obj/machinery/alarm{ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bLh" = ( /turf/simulated/wall, @@ -41173,15 +40102,14 @@ }, /area/storage/tools) "bLk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, /area/storage/tools) @@ -41231,14 +40159,12 @@ /area/security/detectives_office) "bLs" = ( /obj/structure/table/wood, -/obj/item/clipboard, /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/plasteel{ icon_state = "carpet" }, /area/security/detectives_office) "bLt" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "carpet" }, @@ -41278,18 +40204,17 @@ }, /area/security/brig) "bLy" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/hallway/primary/starboard) "bLz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -41313,12 +40238,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Research Toxins Storage Room"; - dir = 4; - network = list("Research","SS13"); - pixel_y = -22 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; @@ -41326,9 +40245,7 @@ }, /area/security/brig) "bLD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -41338,8 +40255,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ @@ -41378,7 +40294,6 @@ }, /area/security/processing) "bLK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41467,7 +40382,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/space/nearstation) +/area/construction/hallway) "bLV" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -41488,13 +40403,12 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/space/nearstation) +/area/construction/hallway) "bLW" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -41512,8 +40426,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/hatch{ name = "MiniSat Transit Tube"; @@ -41541,12 +40454,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -41558,19 +40472,21 @@ "bMb" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" }, /area/hallway/primary/fore) "bMc" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Primary Security Hallway North"; dir = 4; pixel_y = -22 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -41580,8 +40496,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -41670,8 +40585,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41731,8 +40645,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -41813,10 +40726,14 @@ }, /area/storage/tech) "bMD" = ( -/obj/structure/sign/poster/random{ - pixel_x = -32 +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen/multi, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/plating, /area/maintenance/starboard) "bME" = ( /obj/structure/table/reinforced, @@ -41837,8 +40754,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -41890,14 +40806,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -41905,28 +40819,22 @@ icon_state = "1-4" }, /obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bMN" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bMO" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/folder/blue, @@ -41939,8 +40847,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/brown{ dir = 4 @@ -41967,8 +40874,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/folder/red, @@ -41976,8 +40882,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -41996,8 +40901,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42010,17 +40914,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bMU" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bMV" = ( /obj/machinery/light{ @@ -42055,8 +40955,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42083,8 +40982,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42094,49 +40992,37 @@ /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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bNe" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "4-8" }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bNf" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/brown{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bNg" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/cigar, /obj/item/clothing/mask/cigarette/cigar, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bNh" = ( /obj/machinery/light{ @@ -42145,9 +41031,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bNi" = ( /obj/structure/rack, @@ -42180,7 +41064,6 @@ }, /area/storage/tools) "bNk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -42192,6 +41075,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -42239,13 +41123,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/dark{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -42259,7 +41143,6 @@ }, /area/security/detectives_office) "bNt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 8 }, @@ -42326,9 +41209,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bND" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -42338,16 +41218,13 @@ }, /area/security/processing) "bNE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/security/processing) +/area/security/brig) "bNF" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ @@ -42364,16 +41241,10 @@ }, /area/security/processing) "bNH" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Brig Equipment Storage"; - sortType = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -42383,9 +41254,6 @@ }, /area/security/brig) "bNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -42458,8 +41326,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 @@ -42485,8 +41352,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -42573,8 +41439,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -42584,8 +41449,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -42602,8 +41466,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42679,8 +41542,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42723,8 +41585,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42755,8 +41616,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -42828,9 +41688,7 @@ }, /obj/structure/table/wood, /obj/item/book/manual/security_space_law, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bOF" = ( /obj/structure/chair/comfy/beige{ @@ -42851,14 +41709,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bOI" = ( /obj/structure/chair/comfy/brown{ @@ -42874,8 +41729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/pen, /turf/simulated/floor/carpet, @@ -42885,22 +41739,17 @@ pixel_x = 32; pixel_y = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bOL" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bOM" = ( /obj/machinery/computer/account_database, @@ -42927,8 +41776,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -42975,9 +41823,7 @@ pixel_x = -32; pixel_y = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bOW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42991,23 +41837,18 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bOY" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -43027,18 +41868,14 @@ name = "south bump"; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bPb" = ( /obj/machinery/camera{ c_tag = "Captain's Room"; dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bPc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -43075,9 +41912,9 @@ }, /area/storage/tools) "bPf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/storage/tools) "bPg" = ( @@ -43152,13 +41989,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -43172,7 +42009,6 @@ }, /area/security/detectives_office) "bPp" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/plasteel{ @@ -43191,9 +42027,7 @@ }, /area/security/detectives_office) "bPr" = ( -/obj/machinery/computer/security{ - network = list("SS13","Mining Outpost") - }, +/obj/machinery/computer/security, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -43213,8 +42047,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -43227,8 +42060,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -43249,6 +42081,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPw" = ( @@ -43262,6 +42097,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPx" = ( @@ -43270,12 +42108,13 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/security/processing) -"bPy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/processing) +"bPy" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -43287,16 +42126,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "bPA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/light{ dir = 4 }, @@ -43314,8 +42153,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -43340,8 +42178,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -43358,8 +42195,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "station_ai_airlock"; @@ -43387,8 +42223,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -43415,8 +42250,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/alarm{ pixel_y = 24 @@ -43582,8 +42416,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Mining Maintenance"; @@ -43618,8 +42451,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -43669,8 +42501,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/reinforced, /obj/item/clipboard, @@ -43755,6 +42586,9 @@ icon_state = "1-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43847,11 +42681,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bQz" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -43861,8 +42695,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -43910,9 +42743,7 @@ }, /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bQF" = ( /obj/item/radio/intercom{ @@ -43920,16 +42751,12 @@ pixel_y = -28 }, /obj/machinery/slot_machine, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bQG" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bQH" = ( /obj/machinery/alarm{ @@ -43940,9 +42767,7 @@ c_tag = "Command Meeting Room"; dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bQI" = ( /turf/simulated/wall, @@ -43953,12 +42778,9 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/bridge/meeting_room) "bQK" = ( /obj/machinery/alarm{ @@ -43982,8 +42804,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/ai_slipper, /turf/simulated/floor/bluegrid, @@ -44023,8 +42844,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/machinery/door/window{ @@ -44038,7 +42858,6 @@ /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" = ( @@ -44066,16 +42885,12 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Captain's Office" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bQU" = ( /obj/structure/table/wood, /obj/machinery/recharger, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bQV" = ( /obj/structure/sign/directions/engineering{ @@ -44095,33 +42910,30 @@ /turf/simulated/floor/plating, /area/storage/tools) "bQX" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/glass{ name = "Auxiliary Tool Storage"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/storage/tools) "bRa" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/security/glass{ @@ -44129,6 +42941,7 @@ req_access_txt = "4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -44139,8 +42952,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -44149,29 +42961,24 @@ /turf/simulated/floor/plating, /area/security/detectives_office) "bRc" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/security/detectives_office) +/turf/simulated/floor/plasteel, +/area/maintenance/starboard2) "bRd" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/hallway/primary/starboard) "bRe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44179,12 +42986,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRf" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44193,12 +43000,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRg" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRg" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -44219,29 +43026,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"bRh" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/security/brig) +"bRh" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/brig) "bRi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44249,6 +43054,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -44261,6 +43069,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -44578,8 +43390,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/reinforced, /obj/item/cartridge/engineering{ @@ -44629,8 +43440,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -44640,8 +43450,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -44662,8 +43471,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44679,8 +43487,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44696,14 +43503,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark/start{ name = "Chief Engineer" @@ -44733,8 +43538,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44749,8 +43553,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -44763,8 +43566,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44799,8 +43601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -44818,8 +43619,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -44848,8 +43648,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44867,8 +43666,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -44879,8 +43677,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -44898,8 +43695,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -44920,8 +43716,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -44957,8 +43752,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -45036,8 +43830,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/comfy/brown{ dir = 1 @@ -45047,7 +43840,6 @@ }, /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" = ( @@ -45067,9 +43859,7 @@ /area/crew_quarters/captain/bedroom) "bSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -45112,11 +43902,11 @@ }, /area/hallway/primary/starboard) "bSY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -45154,37 +43944,40 @@ /turf/simulated/floor/plasteel, /area/storage/tools) "bTf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bTg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" }, -/area/hallway/primary/starboard) +/turf/simulated/floor/plating, +/area/maintenance/starboard2) "bTh" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -45204,8 +43997,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -45310,8 +44102,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -45331,8 +44122,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -45354,8 +44144,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -45407,14 +44196,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /mob/living/simple_animal/bot/secbot/pingsky, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -45648,8 +44435,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -45683,8 +44469,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -45693,8 +44478,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -45707,8 +44491,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45719,8 +44502,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -45819,8 +44601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -45868,8 +44649,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -45887,8 +44667,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; @@ -45902,8 +44681,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -45924,8 +44702,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -45957,8 +44734,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -46025,8 +44801,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi2"; @@ -46117,8 +44892,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall5"; @@ -46169,32 +44943,24 @@ }, /obj/item/paper_bin, /obj/item/stamp/hop, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bUR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/keycard_auth{ pixel_y = 26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bUT" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bUU" = ( /obj/structure/table/wood, /obj/item/storage/box/ids, /obj/item/storage/box/PDAs, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bUV" = ( /obj/machinery/computer/communications, @@ -46218,12 +44984,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" = ( @@ -46285,8 +45049,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -46309,15 +45072,18 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall11"; location = "hall10" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -46327,8 +45093,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/lattice/catwalk, /turf/space, @@ -46337,8 +45102,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -46355,8 +45119,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -46390,14 +45153,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -46417,49 +45178,37 @@ icon_state = "1-4"; tag = "90Curve" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/starboard) "bVm" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "redcorner" }, -/area/hallway/primary/starboard) +/area/security/brig) "bVn" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -46474,14 +45223,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -46545,8 +45292,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -46580,8 +45326,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -46600,8 +45345,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -46611,11 +45355,11 @@ }, /area/hallway/primary/port) "bVD" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -46624,12 +45368,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/machinery/door/airlock/glass{ - name = "Magistrate's Office"; - req_access_txt = "74" +/obj/machinery/door/airlock{ + name = "Court"; + req_access_txt = "38" }, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) @@ -47004,8 +45747,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 10; @@ -47079,8 +45821,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -47206,9 +45947,7 @@ }, /area/crew_quarters/heads/hop) "bWR" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bWT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -47221,16 +45960,13 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bWW" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/command{ id_tag = "captainofficedoor"; @@ -47240,10 +45976,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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bWX" = ( /turf/simulated/wall, @@ -47264,9 +45997,7 @@ }, /area/crew_quarters/captain/bedroom) "bXa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4; @@ -47293,9 +46024,6 @@ }, /area/hallway/primary/starboard) "bXf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -47304,6 +46032,9 @@ pixel_y = -24 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -47312,8 +46043,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -47328,38 +46058,36 @@ /turf/simulated/floor/plasteel, /area/lawoffice) "bXh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXi" = ( +/obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bXj" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -47373,17 +46101,16 @@ }, /area/hallway/primary/starboard) "bXl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -47398,7 +46125,7 @@ /turf/simulated/floor/plating, /area/turret_protected/aisat) "bXn" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -47434,18 +46161,19 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) "bXB" = ( -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -47456,7 +46184,9 @@ "bXC" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47466,12 +46196,12 @@ }, /area/hallway/primary/starboard) "bXD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Primary Security Hallway" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -47495,8 +46225,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -47670,15 +46399,18 @@ /turf/simulated/wall, /area/engine/engineering) "bYa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/light{ + dir = 4 }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/hallway/primary/starboard) "bYb" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -47704,8 +46436,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 0; @@ -47732,22 +46463,20 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "bYm" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/plasteel{ + icon_state = "cult" + }, +/area/magistrateoffice) "bYn" = ( /obj/structure/sign/directions/evac{ pixel_y = -8 @@ -47786,8 +46515,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/card, /turf/simulated/floor/plasteel{ @@ -47799,37 +46527,20 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/crew_quarters/heads/hop) -"bYs" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bYu" = ( /obj/machinery/status_display{ pixel_x = 32 }, /obj/machinery/pdapainter, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bYv" = ( /turf/simulated/wall/r_wall, /area/ntrep) -"bYw" = ( -/turf/simulated/wall, -/area/civilian/barber) "bYx" = ( /turf/simulated/wall/r_wall, /area/blueshield) @@ -47838,36 +46549,30 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "bYz" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "bYA" = ( /obj/machinery/light_switch{ pixel_x = -8; pixel_y = 26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "bYB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -47895,8 +46600,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -47937,12 +46641,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -47965,8 +46670,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -47974,9 +46678,8 @@ name = "Internal Affairs Office"; req_access_txt = "38" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, /area/lawoffice) "bYP" = ( /obj/machinery/door/poddoor/shutters{ @@ -47992,21 +46695,23 @@ req_access_txt = "74" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/magistrateoffice) "bYQ" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "open"; - id_tag = "magistrate"; - name = "Magistrate Privacy Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/magistrateoffice) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "bYR" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -48050,8 +46755,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48062,8 +46766,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48080,8 +46783,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -48098,8 +46800,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48117,8 +46818,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -48126,8 +46826,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -48149,8 +46848,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d2 = 8; @@ -48188,7 +46886,9 @@ }, /area/turret_protected/aisat) "bZi" = ( -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Court gallery" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -48325,14 +47025,18 @@ name = "Engineering Junction"; sortType = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZA" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -48341,8 +47045,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -48357,8 +47060,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -48370,8 +47072,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -48537,8 +47238,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -48576,78 +47276,54 @@ /obj/machinery/photocopier/faxmachine{ department = "Head of Personnel's Office" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cab" = ( /obj/structure/closet/secure_closet/ntrep, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "cac" = ( /obj/machinery/computer/secure_data, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cad" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cae" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/bookcase, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_general, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_medical, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_security, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/turf/simulated/floor/wood, /area/ntrep) "caf" = ( -/obj/machinery/dye_generator, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24 +/obj/structure/chair/sofa/right, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) "cag" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/chair/barber{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/obj/structure/chair/sofa, +/turf/simulated/floor/wood, +/area/ntrep) "cah" = ( -/obj/structure/table/reinforced, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/item/razor, -/obj/machinery/camera{ - c_tag = "Barber Shop" - }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/obj/structure/chair/sofa/corner, +/turf/simulated/floor/wood, +/area/ntrep) "cai" = ( /obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "caj" = ( /obj/structure/table/wood, @@ -48664,9 +47340,7 @@ /area/blueshield) "cal" = ( /obj/structure/closet/secure_closet/blueshield, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cam" = ( /obj/structure/table/wood, @@ -48682,8 +47356,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -48691,7 +47364,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cao" = ( @@ -48701,9 +47373,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cap" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -48712,17 +47382,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "caq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "car" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -48786,13 +47452,13 @@ }, /area/crew_quarters/courtroom) "caz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Primary Security Hallway East"; dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -48851,59 +47517,54 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/item/clipboard, +/obj/item/toy/figure/crew/lawyer, +/turf/simulated/floor/wood, /area/lawoffice) "caH" = ( /obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/toy/figure/crew/lawyer, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/photocopier/faxmachine/longrange{ + department = "IAA Office" }, +/turf/simulated/floor/wood, /area/lawoffice) "caI" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, +/turf/simulated/floor/wood, /area/lawoffice) "caJ" = ( -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Magistrate's Office" - }, -/obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, +/turf/simulated/floor/wood, /area/lawoffice) "caK" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/obj/structure/closet/lawcloset, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/filingcabinet/security, +/turf/simulated/floor/wood, /area/lawoffice) "caM" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/computer/prisoner{ req_access = null; req_access_txt = "2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -48922,8 +47583,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -48937,8 +47597,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door_timer/cell_5{ pixel_y = -32 @@ -49235,6 +47894,11 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -49262,6 +47926,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -49342,9 +48009,7 @@ dir = 1; in_use = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cbB" = ( /obj/effect/decal/cleanable/dirt, @@ -49357,8 +48022,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -49408,8 +48072,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10; @@ -49498,8 +48161,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -49511,8 +48173,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -49541,8 +48202,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -49565,9 +48225,10 @@ }, /area/hallway/primary/central) "cbW" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/keycard_auth{ + pixel_x = -24 }, +/turf/simulated/floor/wood, /area/ntrep) "cbX" = ( /obj/structure/table/wood, @@ -49577,7 +48238,7 @@ pixel_x = -5; pixel_y = 12 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cbY" = ( /obj/structure/chair/office/dark{ @@ -49586,51 +48247,51 @@ /obj/effect/landmark/start{ name = "Nanotrasen Representative" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cbZ" = ( /obj/structure/chair/comfy/black{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, +/turf/simulated/floor/wood, /area/ntrep) "cca" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/turf/simulated/floor/wood, +/area/ntrep) "ccb" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = 3; + pixel_y = -3 }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = -3; + pixel_y = 3 }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) "ccc" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ +/obj/structure/chair/sofa{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) "ccd" = ( /obj/structure/chair/comfy/black{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cce" = ( /obj/structure/table/wood, @@ -49650,9 +48311,7 @@ }, /area/blueshield) "ccg" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cch" = ( /obj/structure/table/wood, @@ -49675,73 +48334,51 @@ /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/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cck" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /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" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "ccl" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "ccm" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/window{ dir = 8; @@ -49807,8 +48444,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -49822,8 +48458,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49837,8 +48472,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -49860,8 +48494,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49888,14 +48521,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49903,16 +48534,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "ccz" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49946,8 +48574,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -49958,6 +48585,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -49967,10 +48595,8 @@ dir = 8; pixel_x = 24 }, -/obj/structure/filingcabinet/security, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/closet/lawcloset, +/turf/simulated/floor/wood, /area/lawoffice) "ccD" = ( /obj/item/radio/intercom/department/security{ @@ -50007,7 +48633,7 @@ }, /area/magistrateoffice) "ccL" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/light/small{ dir = 8 }, @@ -50016,7 +48642,7 @@ }, /area/security/evidence) "ccM" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -50049,7 +48675,7 @@ }, /area/crew_quarters/courtroom) "ccP" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/light/small{ dir = 4 }, @@ -50163,8 +48789,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -50294,9 +48919,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cdy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -50319,9 +48942,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cdB" = ( /obj/structure/sign/nosmoking_2, @@ -50357,8 +48978,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, @@ -50370,98 +48990,60 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cdI" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24 - }, /obj/machinery/door/window{ dir = 2; name = "Desk Door"; req_access_txt = "73" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/light{ + dir = 8 }, +/turf/simulated/floor/wood, /area/ntrep) "cdJ" = ( /obj/structure/table/wood, /obj/item/folder, /obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cdK" = ( /obj/structure/table/wood, /obj/item/stamp/rep, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cdL" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/ntrep) -"cdM" = ( -/obj/effect/landmark/start{ - name = "Barber" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) -"cdN" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/structure/chair/barber{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) +"cdN" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/wood, +/area/ntrep) "cdO" = ( -/obj/structure/table/reinforced, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/item/razor, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/chair/sofa/left{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "barber" +/obj/machinery/light{ + dir = 4 }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) "cdP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cdQ" = ( /obj/structure/table/wood, @@ -50498,9 +49080,7 @@ /obj/machinery/keycard_auth{ pixel_x = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cdT" = ( /obj/structure/table/wood, @@ -50519,23 +49099,17 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cdW" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cdX" = ( /obj/machinery/firealarm{ @@ -50547,9 +49121,7 @@ c_tag = "Captain's Quarters"; dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cdY" = ( /obj/structure/cable, @@ -50622,8 +49194,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -50651,19 +49222,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "cen" = ( /obj/structure/table/wood, @@ -50685,30 +49250,29 @@ }, /area/lawoffice) "cep" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/lawoffice) "ceq" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "cer" = ( /obj/structure/chair/comfy/brown{ @@ -50736,38 +49300,23 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/brig) -"cez" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/brig) "ceA" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/security{ name = "Security-Storage Backroom"; @@ -50783,8 +49332,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50844,8 +49392,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -50893,8 +49440,11 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "ceQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + icon_state = "pipe-j2s"; + name = "Chemistry Junction"; + sortType = 11 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -50979,9 +49529,7 @@ /area/engine/engineering) "cfa" = ( /obj/structure/closet/secure_closet/captains, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) "cfb" = ( /obj/structure/disposalpipe/segment, @@ -51047,8 +49595,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/monitor{ name = "Grid Power Monitoring Computer" @@ -51067,8 +49614,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -51079,8 +49625,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/wall/r_wall, /area/engine/engineering) @@ -51089,8 +49634,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, @@ -51100,14 +49644,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -51133,27 +49675,19 @@ dir = 4; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfr" = ( /obj/structure/chair/office/dark, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfs" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cft" = ( /obj/machinery/bookbinder, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfu" = ( /obj/structure/bookcase, @@ -51163,25 +49697,20 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfv" = ( /obj/structure/chair/comfy/red, /obj/effect/landmark/start{ name = "Civilian" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfw" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -51195,9 +49724,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfy" = ( /obj/structure/bookcase, @@ -51210,24 +49737,18 @@ /obj/machinery/camera{ c_tag = "Library Starboard" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfz" = ( /obj/structure/chair/comfy/red, /obj/item/radio/intercom{ pixel_y = 26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfA" = ( /obj/machinery/vending/coffee, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cfB" = ( /obj/machinery/light/small, @@ -51244,8 +49765,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/security/mining, /turf/simulated/floor/plasteel{ @@ -51257,16 +49777,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/office/dark, /obj/effect/landmark/start{ name = "Head of Personnel" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cfE" = ( /obj/structure/table/wood, @@ -51274,72 +49791,36 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) -"cfF" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/ntrep) "cfG" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cfH" = ( -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "cfI" = ( /obj/structure/cable{ + d1 = 1; d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "east bump"; - pixel_x = 24; - shock_proof = 1 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) -"cfJ" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) "cfK" = ( -/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 = "barber" - }, -/area/civilian/barber) +/turf/simulated/floor/wood, +/area/ntrep) "cfL" = ( -/obj/structure/dresser, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/obj/item/flag/nt, +/turf/simulated/floor/wood, +/area/ntrep) "cfM" = ( /obj/structure/cable{ d2 = 2; @@ -51354,9 +49835,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cfN" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -51375,16 +49854,13 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cfQ" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command{ @@ -51394,15 +49870,13 @@ 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" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -51465,9 +49939,7 @@ /obj/effect/landmark/start{ name = "Internal Affairs Agent" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "cgb" = ( /obj/structure/table/wood, @@ -51490,15 +49962,14 @@ }, /area/lawoffice) "cgd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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{ icon_state = "grimy" }, @@ -51510,7 +49981,7 @@ /turf/simulated/floor/carpet, /area/magistrateoffice) "cgg" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/alarm{ pixel_y = 24 }, @@ -51548,10 +50019,6 @@ /turf/simulated/floor/carpet, /area/magistrateoffice) "cgj" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -51567,6 +50034,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -51579,8 +50050,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -51596,8 +50066,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -51611,19 +50080,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/security/brig) "cgo" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/item/radio/intercom{ dir = 8; pixel_y = -28 @@ -51650,6 +50117,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/closet, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51771,9 +50239,9 @@ }, /area/engine/engineering) "cgK" = ( -/obj/machinery/door/airlock/glass{ - name = "Magistrate's Office"; - req_access_txt = "74" +/obj/machinery/door/airlock{ + name = "Court"; + req_access_txt = "38" }, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) @@ -51822,9 +50290,7 @@ c_tag = "Magistrate's Office"; dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "cgW" = ( /obj/structure/table/wood, @@ -51832,17 +50298,13 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cgX" = ( /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cgY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -51858,7 +50320,10 @@ }, /area/toxins/xenobiology) "cha" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -51866,7 +50331,9 @@ /area/medical/medbay) "chb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -51902,9 +50369,7 @@ /obj/structure/table/wood, /obj/item/folder/blue, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "chh" = ( /obj/structure/table/wood, @@ -51916,84 +50381,78 @@ /area/crew_quarters/heads/hop) "chj" = ( /obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "chk" = ( -/obj/structure/bookcase, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_general, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/vending/coffee/free, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 }, +/turf/simulated/floor/wood, /area/ntrep) "chl" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/ntrep) "chm" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light_switch{ pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "chn" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/spawner/window/reinforced/polarized, /turf/simulated/floor/plating, -/area/civilian/barber) +/area/ntrep) "cho" = ( /obj/structure/cable{ - d1 = 1; + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "0-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Barber Shop" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "barber" - }, -/area/civilian/barber) +/obj/effect/spawner/window/reinforced/polarized, +/turf/simulated/floor/plating, +/area/ntrep) "chp" = ( -/turf/simulated/wall/r_wall, -/area/civilian/barber) +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/spawner/window/reinforced/polarized, +/turf/simulated/floor/plating, +/area/ntrep) "chq" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light_switch{ pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "chr" = ( /obj/machinery/hologram/holopad, @@ -52010,9 +50469,7 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cht" = ( /turf/simulated/wall/r_wall, @@ -52041,8 +50498,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -52051,17 +50507,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/teleporter) "chy" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -52070,10 +50522,6 @@ /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" = ( @@ -52111,12 +50559,10 @@ }, /area/crew_quarters/courtroom) "chG" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -52125,8 +50571,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -52173,37 +50618,28 @@ dir = 8; pixel_x = -28 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "chM" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "chN" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "chO" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, /area/lawoffice) "chP" = ( /obj/structure/rack, @@ -52212,28 +50648,23 @@ pixel_y = 4 }, /obj/item/storage/secure/briefcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/lawoffice) "chQ" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigEast"; @@ -52282,8 +50713,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -52299,8 +50729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -52463,9 +50892,7 @@ /obj/effect/landmark/start{ name = "Civilian" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "civ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -52506,7 +50933,9 @@ "ciA" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -52524,9 +50953,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "ciD" = ( /obj/structure/chair/office/dark{ @@ -52541,9 +50968,7 @@ pixel_x = 24 }, /mob/living/simple_animal/pet/dog/corgi/Ian, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "ciF" = ( /obj/machinery/photocopier, @@ -52554,9 +50979,7 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "ciG" = ( /obj/structure/cable{ @@ -52565,16 +50988,13 @@ icon_state = "2-4" }, /obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "ciH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/alarm{ dir = 1; @@ -52588,16 +51008,13 @@ dir = 4 }, /obj/machinery/disposal, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "ciI" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -52607,8 +51024,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -52620,12 +51036,9 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "ciJ" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -52636,31 +51049,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/spawner/window/reinforced/polarized, /turf/simulated/floor/plating, /area/ntrep) "ciL" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - icon_state = "neutral" - }, -/area/bridge/meeting_room) -"ciM" = ( -/obj/structure/sign/barber{ - pixel_x = -4; - pixel_y = 32 + initialize_directions = 11 }, /obj/machinery/light{ dir = 1; on = 1 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/hallway/primary/central/south) +"ciM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52671,7 +51085,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "ciN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -52690,14 +51104,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; @@ -52714,16 +51126,13 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "ciP" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/alarm{ dir = 1; @@ -52737,21 +51146,16 @@ dir = 8 }, /obj/machinery/disposal, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "ciQ" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "ciR" = ( /obj/machinery/photocopier, @@ -52762,9 +51166,7 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "ciS" = ( /turf/simulated/wall, @@ -52777,8 +51179,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -52786,7 +51187,6 @@ req_access_txt = "17" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/teleporter) "ciV" = ( @@ -52893,8 +51293,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -52944,12 +51343,10 @@ }, /area/crew_quarters/courtroom) "cjk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -52957,6 +51354,7 @@ req_access_txt = "38" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard2) "cjl" = ( @@ -53027,8 +51425,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/security/range) @@ -53093,8 +51490,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -53265,12 +51661,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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, /area/teleporter) "cka" = ( @@ -53296,14 +51690,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/maintenance/port) @@ -53311,8 +51703,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; @@ -53333,8 +51724,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -53343,7 +51733,6 @@ }, /area/library) "cki" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 @@ -53352,20 +51741,22 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "ckj" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "ckk" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "ckl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -53406,16 +51797,13 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "ckq" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -53434,21 +51822,18 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "ckt" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable, +/obj/effect/spawner/window/reinforced/polarized, /turf/simulated/floor/plating, /area/ntrep) "cku" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -53456,22 +51841,19 @@ req_access_txt = "73" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/ntrep) "ckv" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "ckw" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -53479,13 +51861,11 @@ req_access_txt = "67" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "ckx" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/blueshield) "cky" = ( @@ -53518,20 +51898,12 @@ }, /obj/structure/table, /obj/item/hand_tele, -/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" = ( @@ -53543,10 +51915,6 @@ 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" = ( @@ -53558,9 +51926,6 @@ /area/security/range) "ckF" = ( /obj/machinery/teleport/hub, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/teleporter) "ckG" = ( @@ -53569,9 +51934,6 @@ id_tag = "teleaccessshutter"; name = "Teleporter Access Shutters" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/teleporter) "ckH" = ( @@ -53579,36 +51941,27 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/hallway/primary/central) +/area/medical/research) "ckI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) +"ckJ" = ( /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" + icon_state = "whiteblue" }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) +/area/medical/medbay) "ckK" = ( /obj/structure/chair{ dir = 4 @@ -53652,8 +52005,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -53675,15 +52027,10 @@ }, /area/crew_quarters/courtroom) "ckR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "blobstart" @@ -53692,37 +52039,27 @@ /area/maintenance/starboard2) "ckS" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue" }, -/turf/simulated/floor/plasteel, -/area/maintenance/starboard2) +/area/medical/medbay) "ckT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/starboard2) "ckU" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -53735,17 +52072,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard2) "ckV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -53756,17 +52093,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard2) -"ckW" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) +"ckW" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -53774,17 +52110,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard2) -"ckX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) +"ckX" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -53795,17 +52130,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard2) -"ckY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) +"ckY" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -53814,24 +52148,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "ckZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -53839,14 +52170,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard2) "cla" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -53864,8 +52198,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/west, @@ -53887,14 +52220,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -53909,8 +52240,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -53922,8 +52252,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/window{ dir = 8; @@ -53941,8 +52270,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/security/range) @@ -53950,8 +52278,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -53960,8 +52287,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "blobstart" @@ -53972,14 +52298,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/target_stake, @@ -53998,8 +52322,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -54042,8 +52365,8 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "clt" = ( +/obj/structure/closet/wardrobe/engineering_yellow, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/vending/engidrobe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -54072,8 +52395,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -54091,7 +52413,6 @@ }, /area/maintenance/port) "clA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -54104,8 +52425,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -54115,9 +52435,7 @@ /area/library) "clC" = ( /obj/structure/bookcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "clD" = ( /obj/structure/table/wood, @@ -54208,24 +52526,19 @@ name = "Head of Personnel Bedroom"; req_access_txt = "57" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "clL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "clM" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54242,8 +52555,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -54259,47 +52571,36 @@ dir = 4; pixel_x = 28 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "clQ" = ( /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "clS" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "clT" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; @@ -54308,17 +52609,21 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "clU" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Central Ring Hallway Center" @@ -54327,20 +52632,19 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "clV" = ( /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "clW" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -54379,18 +52683,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/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54398,10 +52697,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /turf/simulated/floor/plasteel, /area/teleporter) "cmb" = ( @@ -54413,8 +52708,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -54422,24 +52716,15 @@ /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/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/east, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel, /area/teleporter) "cmd" = ( @@ -54493,8 +52778,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -54517,15 +52801,10 @@ }, /area/crew_quarters/courtroom) "cmn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" }, -/turf/simulated/floor/plating, -/area/maintenance/starboard2) +/area/hallway/primary/aft) "cmo" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -54544,17 +52823,17 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "cmt" = ( -/obj/structure/closet/wardrobe/grey, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/maintenance/starboard) "cmv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard) "cmx" = ( @@ -54595,8 +52874,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/south, @@ -54642,8 +52920,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/security/range) @@ -54847,20 +53124,15 @@ name = "west bump"; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cni" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "4-8" }, +/turf/simulated/floor/wood, /area/library) "cnj" = ( /obj/structure/cable{ @@ -54924,16 +53196,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cnr" = ( /obj/machinery/firealarm{ @@ -54943,16 +53212,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cns" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -54960,9 +53226,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cnt" = ( /obj/item/twohanded/required/kirbyplants, @@ -54970,9 +53234,7 @@ pixel_x = -8; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cnv" = ( /obj/machinery/hologram/holopad, @@ -54989,26 +53251,25 @@ }, /area/hallway/primary/central) "cnx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cny" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cnz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -55059,8 +53320,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -55115,8 +53375,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -55137,9 +53396,6 @@ }, /area/crew_quarters/courtroom) "cnO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -55151,16 +53407,15 @@ /turf/simulated/wall, /area/crew_quarters/locker) "cnR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "cnS" = ( @@ -55178,8 +53433,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -55332,17 +53586,22 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/northeastcorner, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "com" = ( -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/power/terminal{ dir = 1 }, /obj/effect/decal/warning_stripes/northeast, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "coo" = ( @@ -55399,9 +53658,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cox" = ( /obj/structure/table/wood, @@ -55444,8 +53701,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -55463,9 +53719,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "coC" = ( /obj/effect/spawner/window/reinforced, @@ -55474,14 +53728,14 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "coD" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "coE" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -55583,17 +53837,15 @@ }, /area/crew_quarters/courtroom) "coQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "neutralfull" }, -/area/crew_quarters/locker) +/area/crew_quarters/fitness) "coR" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/plasteel{ @@ -55629,11 +53881,11 @@ }, /area/maintenance/starboard2) "coW" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -55642,8 +53894,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/starboard2) @@ -55664,8 +53915,16 @@ /area/maintenance/starboard2) "cpa" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/structure/closet/secure_closet/security, +/obj/structure/closet/secure_closet{ + anchored = 1; + name = "Evidence Storage"; + req_access_txt = "4" + }, /obj/item/restraints/handcuffs/pinkcuffs, +/obj/item/clothing/under/rank/security, +/obj/item/clothing/under/rank/security, +/obj/item/grenade/barrier, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/plating, /area/maintenance/starboard2) "cpb" = ( @@ -55860,11 +54119,6 @@ }, /area/engine/engineering) "cpu" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -55881,11 +54135,6 @@ }, /area/engine/engineering) "cpv" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -55987,8 +54236,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -56002,9 +54250,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "cpJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -56047,8 +54293,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -56094,13 +54339,12 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpS" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -56112,7 +54356,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56124,7 +54368,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56145,7 +54389,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56163,13 +54407,12 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpW" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56181,7 +54424,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56196,7 +54439,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cpY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56212,13 +54455,12 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqb" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -56229,7 +54471,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56244,7 +54486,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -56260,7 +54502,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56278,13 +54520,12 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqf" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56299,7 +54540,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56320,13 +54561,10 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqh" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -56334,7 +54572,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56350,7 +54588,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56366,7 +54604,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cql" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56382,7 +54620,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cqn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56402,8 +54640,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -56456,9 +54693,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/glass{ - name = "Magistrate's Office"; - req_access_txt = "74" +/obj/machinery/door/airlock{ + name = "Court"; + req_access_txt = "38" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56484,12 +54721,10 @@ }, /area/crew_quarters/courtroom) "cqv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -56568,18 +54803,17 @@ }, /area/maintenance/starboard) "cqD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/starboard2) "cqE" = ( @@ -56593,8 +54827,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -56610,8 +54843,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -56757,7 +54989,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crf" = ( /obj/machinery/power/tesla_coil, /obj/effect/decal/cleanable/dirt, @@ -56782,9 +55014,7 @@ dir = 1 }, /obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library) "crl" = ( /obj/structure/table/wood, @@ -56837,8 +55067,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -56857,8 +55086,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -56868,8 +55096,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -56886,8 +55113,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -56897,13 +55123,12 @@ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Central Ring Hallway Center"; @@ -56913,13 +55138,12 @@ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crx" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -56931,43 +55155,39 @@ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cry" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crz" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crA" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -56977,33 +55197,30 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crB" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crC" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -57017,20 +55234,19 @@ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crE" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/black, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crF" = ( /obj/structure/cable{ d1 = 1; @@ -57040,27 +55256,24 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/item/radio/beacon, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crG" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/black, /obj/effect/landmark/start{ @@ -57070,13 +55283,12 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -57084,13 +55296,12 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crI" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/securearea{ @@ -57103,25 +55314,23 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crJ" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crK" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -57131,38 +55340,34 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crN" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crO" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -57175,18 +55380,17 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crP" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -57203,13 +55407,12 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "crR" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -57220,14 +55423,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -57248,12 +55449,10 @@ }, /area/hallway/primary/central) "crV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atm{ pixel_x = -32 @@ -57292,6 +55491,10 @@ }, /area/crew_quarters/locker) "csa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -57301,8 +55504,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -57319,6 +55521,9 @@ /area/maintenance/starboard2) "csc" = ( /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "csd" = ( @@ -57334,7 +55539,6 @@ pixel_y = -24 }, /obj/structure/table, -/obj/item/clothing/under/rank/security, /turf/simulated/floor/plating, /area/maintenance/starboard2) "csf" = ( @@ -57353,11 +55557,13 @@ /area/maintenance/starboard2) "csh" = ( /obj/structure/rack, -/obj/item/storage/box/flashes, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /turf/simulated/floor/plating, /area/maintenance/starboard2) "csi" = ( @@ -57576,8 +55782,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -57607,10 +55812,6 @@ /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" = ( @@ -57625,7 +55826,7 @@ /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -57637,7 +55838,7 @@ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -57649,7 +55850,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -57658,13 +55859,12 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csR" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/landmark{ @@ -57674,7 +55874,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -57683,7 +55883,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -57695,7 +55895,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -57706,7 +55906,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csV" = ( /turf/simulated/wall/r_wall, /area/gateway) @@ -57715,26 +55915,24 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csX" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "csY" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -57749,41 +55947,45 @@ /obj/machinery/vending/cigarette, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cta" = ( /obj/machinery/vending/coffee, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "ctb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 8; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/hallway/primary/central) +/area/medical/chemistry) "ctc" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "ctd" = ( +/obj/structure/cable{ + 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/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "whitebluefull" }, -/area/hallway/primary/central) +/area/medical/medbay) "ctf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -57806,29 +56008,32 @@ }, /area/hallway/primary/central) "ctj" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/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{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/hallway/primary/central) +/area/medical/medbay) "ctk" = ( /obj/machinery/vending/cola, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "ctl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -57889,10 +56094,6 @@ }, /area/medical/medbay) "cts" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ dir = 8; @@ -57914,13 +56115,12 @@ }, /area/crew_quarters/courtroom) "ctv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "ctw" = ( @@ -57976,18 +56176,9 @@ icon_state = "neutralcorner" }, /area/crew_quarters/fitness) -"ctC" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/crew_quarters/fitness) "ctD" = ( /obj/structure/closet/masks, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "ctE" = ( /obj/machinery/door/poddoor/shutters{ @@ -58170,8 +56361,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, @@ -58201,36 +56391,32 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cua" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cub" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/paper_bin, @@ -58238,13 +56424,12 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cuc" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/black{ dir = 1 @@ -58256,7 +56441,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cud" = ( /obj/structure/cable{ d1 = 1; @@ -58266,20 +56451,18 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cue" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/comfy/black{ dir = 1 @@ -58288,46 +56471,43 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cuf" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cug" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cuh" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cuk" = ( /obj/structure/closet/secure_closet/exile, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -58349,16 +56529,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/gateway) @@ -58382,6 +56560,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -58456,8 +56635,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -58524,7 +56702,6 @@ }, /area/crew_quarters/locker) "cuC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 @@ -58544,10 +56721,6 @@ }, /area/crew_quarters/locker) "cuF" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -58559,17 +56732,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard2) "cuG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -58578,17 +56751,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard2) -"cuH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) +"cuH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -58596,17 +56768,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/maintenance/starboard2) -"cuI" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/starboard2) +"cuI" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -58615,14 +56786,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "cuJ" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/glass{ name = "Cabin" @@ -58630,14 +56803,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "cuK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -58645,21 +56814,19 @@ /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/crew_quarters/fitness) "cuL" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -58667,6 +56834,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -58683,10 +56854,7 @@ dir = 4 }, /obj/structure/closet/athletic_mixed, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cuO" = ( /obj/machinery/power/tesla_coil{ @@ -58815,8 +56983,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -58824,8 +56991,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -58837,8 +57003,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -58853,8 +57018,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -58864,8 +57028,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -58915,10 +57078,6 @@ }, /area/medical/research) "cvm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; initialize_directions = 11 @@ -58926,6 +57085,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59034,8 +57196,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -59075,8 +57236,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -59097,37 +57257,36 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cvE" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cvF" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cvG" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cvH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cvI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -59153,8 +57312,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/closet/secure_closet/medical1, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -59164,14 +57322,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59237,16 +57393,12 @@ }, /area/medical/chemistry) "cvV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/glass{ name = "Cabin" }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "cvW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; @@ -59254,9 +57406,6 @@ }, /area/hallway/primary/central) "cvX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -24 @@ -59272,14 +57421,10 @@ /turf/simulated/floor/plasteel, /area/gateway) "cvZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -59287,28 +57432,34 @@ }, /area/crew_quarters/locker) "cwa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" }, -/obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cwc" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/cable{ + 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/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/crew_quarters/locker) +/area/medical/medbay) "cwd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -59317,15 +57468,6 @@ icon_state = "neutralfull" }, /area/crew_quarters/locker) -"cwe" = ( -/obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/locker) "cwf" = ( /obj/structure/closet/wardrobe/grey, /obj/machinery/ai_status_display{ @@ -59352,8 +57494,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -59361,6 +57502,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -59369,8 +57513,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -59378,6 +57521,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59399,10 +57545,7 @@ /area/medical/medbay) "cws" = ( /obj/structure/closet/boxinggloves, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cwt" = ( /obj/effect/decal/warning_stripes/northwest, @@ -59484,8 +57627,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/maintenance/port) @@ -59673,8 +57815,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -59687,8 +57828,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -59710,8 +57850,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -59724,8 +57863,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -59756,34 +57894,26 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Corporate Lounge"; - req_one_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/door/airlock/public/glass{ + id_tag = "pub_room"; + name = "Public Meeting Room" }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cxc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Corporate Lounge"; - req_one_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/door/airlock/public/glass{ + id_tag = "pub_room"; + name = "Public Meeting Room" }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cxd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -59800,8 +57930,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -59819,8 +57948,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/gateway) @@ -59886,8 +58014,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 8 @@ -59943,7 +58070,6 @@ /turf/simulated/floor/plasteel, /area/medical/research) "cxv" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -59958,12 +58084,10 @@ }, /area/crew_quarters/locker) "cxx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -59973,6 +58097,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -60028,7 +58153,6 @@ }, /area/crew_quarters/fitness) "cxD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 11 @@ -60080,8 +58204,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table, /obj/item/paper/pamphlet, @@ -60098,8 +58221,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/engine/engine_smes) @@ -60137,7 +58259,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cxP" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -60146,8 +58268,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -60297,42 +58418,33 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced, /obj/structure/showcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cyi" = ( /obj/structure/bookcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cyj" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cyk" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/carpet, /area/assembly/showroom) @@ -60341,7 +58453,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Showroom" + c_tag = "Public Meeting Room" }, /turf/simulated/floor/carpet, /area/assembly/showroom) @@ -60353,25 +58465,20 @@ /area/assembly/showroom) "cyo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cyp" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/showcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "cyq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -60405,8 +58512,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -60449,8 +58555,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -60531,10 +58636,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cyG" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60581,8 +58686,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plasteel{ @@ -60594,8 +58698,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -60606,8 +58709,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -60619,8 +58721,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table, /obj/item/folder, @@ -60634,8 +58735,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table, /obj/item/paicard, @@ -60651,8 +58751,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -60664,14 +58763,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/stool, /obj/effect/landmark/start{ @@ -60683,12 +58780,10 @@ }, /area/crew_quarters/locker) "cyR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -60750,35 +58845,35 @@ }, /area/crew_quarters/sleep) "cyW" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/item/pen, -/obj/machinery/light{ +/obj/machinery/power/apc{ dir = 1; - in_use = 1 + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/chair/barber{ + dir = 4 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "cyX" = ( -/obj/item/radio/intercom{ - pixel_x = 26; - pixel_y = 28 +/obj/structure/table/reinforced, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/item/razor, +/obj/machinery/camera{ + c_tag = "Barber Shop" }, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/lawyer/black, -/obj/item/clothing/under/lawyer/blue, -/obj/item/clothing/under/kilt, -/obj/item/clothing/head/beret, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "cyY" = ( /obj/machinery/cryopod/right, /turf/simulated/floor/plasteel{ @@ -60821,21 +58916,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/fitness) -"czc" = ( -/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{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/fitness) "czd" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -60981,14 +59061,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -61008,8 +59086,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -61053,8 +59130,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61125,8 +59201,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 4; @@ -61142,23 +59217,18 @@ name = "west bump"; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czK" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czL" = ( /obj/structure/cable{ @@ -61177,19 +59247,15 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -61205,14 +59271,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -61222,8 +59286,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/whiskey, @@ -61233,8 +59296,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -61250,8 +59312,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/wood, /obj/item/paper_bin, @@ -61262,29 +59323,23 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czS" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czT" = ( /obj/structure/cable{ @@ -61295,16 +59350,13 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/alarm{ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/assembly/showroom) "czU" = ( /obj/structure/urinal{ @@ -61317,8 +59369,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61371,13 +59422,12 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cAb" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/warning_stripes/north, @@ -61432,8 +59482,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -61463,8 +59512,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/vending/shoedispenser, /turf/simulated/floor/plasteel{ @@ -61476,8 +59524,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61498,28 +59545,25 @@ }, /area/crew_quarters/sleep) "cAo" = ( -/obj/structure/table/wood, /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/folder, -/obj/item/razor, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "cAp" = ( -/obj/structure/chair/office/dark{ - dir = 8 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "cAq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cAr" = ( /turf/simulated/floor/plasteel{ @@ -61662,8 +59706,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/engine/engine_smes) @@ -61682,8 +59725,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -61694,8 +59736,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61706,8 +59747,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -61762,8 +59802,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -61875,20 +59914,18 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cBh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61951,8 +59988,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/clipboard, @@ -61972,8 +60008,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/cigar/havana{ @@ -62007,8 +60042,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/storage/secure/briefcase, @@ -62046,8 +60080,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -62057,8 +60090,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -62077,8 +60109,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -62125,8 +60156,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62136,8 +60166,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -62151,8 +60180,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -62160,8 +60188,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -62172,8 +60199,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -62182,8 +60208,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -62225,18 +60250,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBT" = ( -/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{ @@ -62267,18 +60287,32 @@ }, /area/crew_quarters/sleep) "cBW" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/effect/landmark/start{ + name = "Barber" }, -/area/crew_quarters/sleep) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "cBX" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/table/reinforced, +/obj/structure/mirror{ + pixel_x = 28 }, -/area/crew_quarters/sleep) +/obj/item/razor, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "cBY" = ( /obj/machinery/cryopod/right, /obj/machinery/newscaster{ @@ -62318,8 +60352,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -62456,8 +60489,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62474,8 +60506,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -62530,8 +60561,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -62620,8 +60650,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/folder/yellow, @@ -62651,8 +60680,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, @@ -62677,8 +60705,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood, /obj/item/radio/intercom{ @@ -62708,7 +60735,9 @@ /area/gateway) "cCY" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -62741,8 +60770,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -62763,8 +60791,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62812,8 +60839,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -62827,7 +60853,6 @@ }, /area/crew_quarters/locker) "cDp" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63013,8 +61038,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -63085,8 +61109,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 9; @@ -63239,11 +61262,9 @@ /turf/simulated/floor/plasteel, /area/gateway) "cEq" = ( -/obj/structure/toilet{ - dir = 8 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cEr" = ( @@ -63266,13 +61287,21 @@ }, /area/crew_quarters/sleep) "cEu" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ - name = "Cabin" + name = "Barber Shop" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "barber" }, -/area/crew_quarters/sleep) +/area/civilian/barber) "cEv" = ( /obj/machinery/door/airlock/glass{ name = "Cabin" @@ -63346,14 +61375,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cEL" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -63454,8 +61482,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -63516,8 +61543,14 @@ }, /area/hallway/primary/central) "cFd" = ( -/obj/item/rack_parts, -/turf/simulated/floor/plating, +/obj/structure/chair, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, /area/maintenance/starboard) "cFe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -63584,8 +61617,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63595,18 +61627,20 @@ }, /area/crew_quarters/sleep) "cFo" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/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 = 4; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/crew_quarters/sleep) +/area/medical/medbay) "cFp" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -63619,8 +61653,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -63632,14 +61665,16 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" + }, +/obj/structure/sign/barber{ + pixel_x = 4; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -63650,9 +61685,15 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, +/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{ dir = 1; icon_state = "neutral" @@ -63662,12 +61703,15 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Dorm Hallway Starboard" }, +/obj/structure/sign/barber{ + pixel_x = -4; + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -63677,8 +61721,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -63689,8 +61732,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/glass{ name = "Cabin" @@ -63701,8 +61743,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -63710,21 +61751,19 @@ }, /area/crew_quarters/fitness) "cFy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /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" @@ -63952,8 +61991,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -63970,8 +62008,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -63996,8 +62033,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -64015,14 +62051,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64040,8 +62074,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64058,8 +62091,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64080,8 +62112,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -64105,14 +62136,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64130,8 +62159,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64149,8 +62177,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64170,8 +62197,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64194,8 +62220,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64215,8 +62240,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -64234,8 +62258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64256,8 +62279,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64275,8 +62297,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64293,8 +62314,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "blobstart" @@ -64314,8 +62334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -64333,8 +62352,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64353,8 +62371,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -64373,14 +62390,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -64398,8 +62413,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -64426,8 +62440,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -64454,8 +62467,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -64476,8 +62488,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64493,8 +62504,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/navbeacon{ @@ -64510,8 +62520,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall9"; @@ -64539,16 +62548,16 @@ icon_state = "1-4"; tag = "90Curve" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall10"; location = "hall9" }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -64558,8 +62567,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -64591,16 +62599,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, /area/maintenance/starboard) "cGI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -64614,26 +62621,18 @@ tag = "" }, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cGJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" }, -/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/plating, -/area/maintenance/starboard) +/area/medical/research) "cGK" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -64651,15 +62650,10 @@ }, /area/hallway/primary/central) "cGM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64667,6 +62661,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cGN" = ( @@ -64724,7 +62722,6 @@ }, /area/crew_quarters/sleep) "cGS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -64764,8 +62761,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64852,8 +62848,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ name = "Electrical Maintenance"; @@ -64879,8 +62874,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -64916,8 +62910,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -64935,8 +62928,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -64974,8 +62966,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -65030,22 +63021,6 @@ icon_state = "purplecorner" }, /area/hallway/primary/central) -"cHF" = ( -/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/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -65053,11 +63028,6 @@ /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" @@ -65075,9 +63045,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -65090,10 +63057,6 @@ /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" @@ -65115,10 +63078,6 @@ /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" }, @@ -65131,9 +63090,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -65159,10 +63115,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ +/obj/structure/disposalpipe/segment{ dir = 4; - name = "CMO's Junction"; - sortType = 20 + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" @@ -65257,19 +63212,7 @@ icon_state = "neutral" }, /area/crew_quarters/sleep) -"cIe" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "cIg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -65279,9 +63222,6 @@ }, /area/crew_quarters/sleep) "cIh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; @@ -65293,9 +63233,6 @@ }, /area/crew_quarters/sleep) "cIi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/power/apc{ name = "south bump"; @@ -65311,61 +63248,46 @@ }, /area/crew_quarters/sleep) "cIj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/crew_quarters/sleep) "cIk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cIl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cIm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/glass{ name = "Cabin" }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "cIn" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "whitepurplecorner" }, -/area/crew_quarters/fitness) +/area/medical/research) "cIo" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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 = 8; icon_state = "neutralfull" @@ -65375,8 +63297,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -65399,12 +63320,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIs" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -65413,6 +63332,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -65457,8 +63377,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -65495,8 +63414,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65597,16 +63515,21 @@ /turf/simulated/floor/plating, /area/medical/research) "cIX" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/medical/research) -"cIY" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/research) +"cIY" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/medical/research) "cIZ" = ( /obj/machinery/status_display, /turf/simulated/wall, @@ -65631,10 +63554,9 @@ /turf/simulated/wall, /area/medical/research) "cJc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" }, -/obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -65685,9 +63607,9 @@ /turf/simulated/wall, /area/medical/medbay) "cJj" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/medbay) "cJk" = ( @@ -65698,8 +63620,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, @@ -65769,9 +63690,9 @@ }, /area/medical/medbay2) "cJv" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -65959,14 +63880,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cJY" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -65999,8 +63918,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 8 @@ -66051,8 +63969,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -66068,8 +63985,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark{ name = "blobstart" @@ -66107,21 +64023,17 @@ "cKr" = ( /turf/simulated/wall/r_wall, /area/medical/research) -"cKs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) "cKt" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cKu" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, /turf/simulated/floor/engine, -/area/toxins/explab) +/area/toxins/mixing) "cKv" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -66148,7 +64060,6 @@ }, /area/medical/research) "cKx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair, /turf/simulated/floor/plasteel{ dir = 1; @@ -66156,12 +64067,12 @@ }, /area/medical/research) "cKy" = ( +/obj/item/twohanded/required/kirbyplants, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "dark" }, -/area/medical/research) +/area/medical/cmo) "cKz" = ( /obj/structure/chair, /obj/effect/landmark/start{ @@ -66214,10 +64125,9 @@ "cKE" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "white" }, -/area/medical/research) +/area/medical/genetics) "cKF" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -66247,12 +64157,6 @@ /obj/structure/sign/science, /turf/simulated/wall, /area/medical/research) -"cKL" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" - }, -/area/hallway/primary/aft) "cKM" = ( /obj/structure/table, /obj/item/storage/box/bodybags, @@ -66356,19 +64260,27 @@ "cKY" = ( /turf/simulated/wall, /area/medical/medbay) -"cKZ" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cLa" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "psychoffice"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/starboard) "cLb" = ( -/obj/structure/table_frame, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/medical{ + id_tag = "psychfoyer"; + name = "Psych Office"; + req_access_txt = "64" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, /area/maintenance/starboard) "cLd" = ( /obj/structure/cable{ @@ -66393,14 +64305,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66411,8 +64321,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66420,46 +64329,39 @@ }, /area/medical/medbay2) "cLg" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay2) "cLh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; req_access_txt = "5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/medbay2) "cLi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -66467,14 +64369,17 @@ icon_state = "1-4" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cLk" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -66489,8 +64394,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -66504,14 +64408,10 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cLm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -66520,6 +64420,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "cLn" = ( @@ -66540,9 +64443,7 @@ pixel_x = 26; pixel_y = 28 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cLp" = ( /turf/simulated/floor/carpet, @@ -66618,7 +64519,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/closet/secure_closet/scientist, +/obj/structure/closet/bombcloset, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -66638,15 +64539,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Science Maintenance"; req_access_txt = "47" }, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/maintenance/port) "cLC" = ( /obj/item/clothing/gloves/color/black, /obj/item/wrench, @@ -66693,14 +64593,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -66721,8 +64619,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -66731,8 +64628,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -66754,8 +64650,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -66815,13 +64710,16 @@ }, /area/toxins/xenobiology) "cLV" = ( -/obj/structure/closet/wardrobe/white, -/obj/effect/decal/warning_stripes/yellow, +/obj/structure/table/wood, +/obj/machinery/kitchen_machine/microwave{ + pixel_x = -3; + pixel_y = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplefull" }, -/area/medical/research) +/area/toxins/misc_lab) "cLW" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -66830,14 +64728,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "cLY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -66847,16 +64744,14 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28; - pixel_y = 30 +/obj/structure/chair/comfy/purp{ + dir = 8 }, -/obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 1; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "cMb" = ( /obj/item/radio/intercom{ dir = 1; @@ -66870,17 +64765,17 @@ dir = 1; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "cMc" = ( /obj/machinery/status_display{ pixel_y = 32 }, -/obj/structure/chair/comfy/purp, +/obj/machinery/vending/snack, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "cMd" = ( /obj/structure/table, /obj/item/folder/white, @@ -66893,11 +64788,11 @@ "cMe" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 1; + icon_state = "whitepurplecorner" }, /area/medical/research) "cMf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -66909,9 +64804,22 @@ }, /area/medical/research) "cMg" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -66921,41 +64829,46 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) +/turf/simulated/floor/plating, +/area/medical/morgue) "cMj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "cMk" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "cMl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) +/obj/effect/decal/warning_stripes/east, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "cMm" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67043,8 +64956,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -67057,20 +64969,11 @@ icon_state = "cmo" }, /area/medical/medbay2) -"cMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing) "cME" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -67113,9 +65016,7 @@ "cMM" = ( /obj/structure/bed, /obj/item/bedsheet/red, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cMN" = ( /obj/structure/table/wood, @@ -67209,8 +65110,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -67235,8 +65135,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -67276,10 +65175,6 @@ /turf/simulated/floor/plating, /area/toxins/xenobiology) "cNl" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/structure/window/reinforced{ dir = 8 }, @@ -67288,6 +65183,10 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67296,8 +65195,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -67327,8 +65225,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -67352,14 +65249,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor/preopen{ id_tag = "xeno4"; @@ -67375,26 +65270,24 @@ }, /area/toxins/xenobiology) "cNr" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cNs" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor/preopen{ id_tag = "xeno5"; @@ -67413,14 +65306,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor/preopen{ id_tag = "xeno6"; @@ -67448,14 +65339,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/research/glass{ autoclose = 0; @@ -67482,35 +65371,20 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research) -"cNy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/area/toxins/misc_lab) +"cNA" = ( +/obj/structure/chair/comfy/purp{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"cNA" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/medical/research) -"cNB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cND" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -67519,25 +65393,13 @@ }, /area/medical/research) "cNE" = ( -/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, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + dir = 1; + icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "cNF" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67575,19 +65437,16 @@ }, /area/medical/research) "cNI" = ( -/obj/structure/disposalpipe/segment, -/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/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "redyellowfull" }, -/area/medical/research) +/area/maintenance/apmaint) "cNJ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -67633,7 +65492,6 @@ /turf/simulated/floor/plasteel, /area/medical/research) "cNN" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67654,7 +65512,6 @@ }, /area/hallway/primary/aft) "cNP" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67706,6 +65563,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -67718,12 +65579,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "cNV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67731,6 +65594,10 @@ dir = 1; initialize_directions = 11 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67795,25 +65662,35 @@ /turf/space, /area/space/nearstation) "cOa" = ( -/obj/structure/chair/comfy/lime{ - dir = 4 - }, /obj/machinery/door_control{ id = "psychoffice"; name = "Privacy Shutters Control"; - pixel_x = -25 + pixel_x = -25; + pixel_y = 5 }, -/turf/simulated/floor/carpet, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Psychiatrist" + }, +/obj/machinery/door_control{ + id = "psychfoyer"; + layer = 3.3; + name = "Psych Foyer Doors"; + normaldoorcontrol = 1; + pixel_x = -25; + pixel_y = -6 + }, +/turf/simulated/floor/wood, /area/medical/psych) "cOb" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 5 }, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 - }, -/turf/simulated/floor/carpet, +/obj/item/pen/multi, +/turf/simulated/floor/wood, /area/medical/psych) "cOc" = ( /obj/machinery/firealarm{ @@ -67824,8 +65701,7 @@ pixel_x = 28; pixel_y = 30 }, -/obj/structure/bed/psych, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/medical/psych) "cOd" = ( /obj/structure/table, @@ -67958,8 +65834,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -67970,15 +65845,11 @@ }, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cOq" = ( /obj/structure/chair/office/dark, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cOr" = ( /obj/structure/table/wood, @@ -68079,8 +65950,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -68153,8 +66023,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -68188,8 +66057,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -68254,10 +66122,8 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -68267,26 +66133,13 @@ /obj/structure/sign/biohazard, /turf/simulated/wall, /area/toxins/xenobiology) -"cOZ" = ( -/obj/machinery/chem_master, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/toxins/xenobiology) "cPa" = ( -/obj/machinery/chem_dispenser, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 22 }, -/obj/structure/reagent_dispensers/fueltank/chem{ - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -68307,8 +66160,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -68317,97 +66169,51 @@ }, /area/toxins/xenobiology) "cPe" = ( -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Experimention Lab"; + dir = 1; + network = list("Research","SS13") + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/toxins/explab) "cPg" = ( /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cPh" = ( -/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/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cPi" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/maintenance/electrical) -"cPj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/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{ - 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 - }, /obj/effect/landmark/start{ name = "Scientist" }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research) -"cPl" = ( -/obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/medical/research) +/area/toxins/misc_lab) "cPn" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -68415,7 +66221,6 @@ }, /area/medical/research) "cPo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -68423,7 +66228,6 @@ }, /area/medical/research) "cPq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -68439,14 +66243,14 @@ }, /area/medical/research) "cPs" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/medical/research) +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/apmaint) "cPt" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -68485,20 +66289,7 @@ icon_state = "neutralfull" }, /area/hallway/primary/aft) -"cPz" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Chemistry Junction"; - sortType = 13 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" - }, -/area/hallway/primary/aft) "cPA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -68507,18 +66298,13 @@ /turf/simulated/wall/r_wall, /area/maintenance/starboardsolar) "cPD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" }, /area/medical/medbay) "cPE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -68528,13 +66314,13 @@ /area/medical/medbay) "cPF" = ( /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 8; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue" + icon_state = "redyellowfull" }, -/area/medical/medbay) +/area/maintenance/apmaint) "cPH" = ( /obj/effect/landmark{ name = "lightsout" @@ -68544,13 +66330,13 @@ }, /area/medical/medbay) "cPI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68587,12 +66373,12 @@ }, /area/medical/medbay) "cPM" = ( +/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 = "white" }, @@ -68607,17 +66393,17 @@ name = "Privacy Shutters"; opacity = 0 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/medical/psych) "cPQ" = ( -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/medical/psych) "cPR" = ( -/obj/item/twohanded/required/kirbyplants, /obj/structure/sign/poster/random{ pixel_x = 32 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/medical/psych) "cPS" = ( /obj/effect/spawner/window/reinforced, @@ -68720,9 +66506,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cQb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = "medbayfoyer"; @@ -68732,6 +66515,9 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -68772,17 +66558,13 @@ }, /obj/machinery/light, /obj/item/paicard, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cQf" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/maid, /obj/item/clothing/suit/browntrenchcoat, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/sleep) "cQg" = ( /obj/structure/dresser, @@ -68902,24 +66684,16 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cQw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/obj/machinery/door/airlock/research{ - name = "Research Break Room"; - req_access_txt = "47" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cQx" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -68942,8 +66716,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plating, @@ -68975,8 +66748,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, @@ -68986,8 +66758,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -69014,8 +66785,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -69034,14 +66804,14 @@ }, /area/toxins/xenobiology) "cQI" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69074,14 +66844,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -69114,8 +66882,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -69144,8 +66911,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/east, @@ -69164,8 +66930,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -69173,14 +66938,16 @@ /area/toxins/xenobiology) "cQU" = ( /obj/effect/decal/warning_stripes/west, +/obj/structure/chair/office/light{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cQV" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -69201,34 +66968,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /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 = "whitepurple" - }, -/area/medical/research) -"cRa" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) "cRb" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -69238,14 +66984,15 @@ dir = 4; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "cRc" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" }, -/turf/simulated/floor/plating, -/area/medical/research) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "cRd" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -69255,18 +67002,15 @@ /area/medical/research) "cRe" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "redyellowfull" }, -/area/medical/research) +/area/maintenance/apmaint) "cRf" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/item/radio/intercom{ pixel_y = 28 @@ -69281,24 +67025,21 @@ }, /area/medical/research) "cRh" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/aft) "cRi" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/medical/medbay) +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/apmaint) "cRj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 8; @@ -69314,10 +67055,7 @@ }, /area/medical/medbay) "cRl" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -69371,13 +67109,15 @@ dir = 10; initialize_directions = 10 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/medical/psych) "cRr" = ( -/obj/structure/closet/secure_closet/psychiatrist, -/obj/item/clipboard{ - pixel_x = -5 +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 28 }, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, /area/medical/psych) "cRt" = ( @@ -69399,8 +67139,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69440,8 +67179,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69474,7 +67212,6 @@ }, /area/crew_quarters/fitness) "cRB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -69483,11 +67220,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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 = 8; icon_state = "neutralfull" @@ -69565,8 +67302,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -69597,8 +67333,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/window/brigdoor{ dir = 8; @@ -69632,8 +67367,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -69644,8 +67378,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark/start{ name = "Scientist" @@ -69664,8 +67397,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69692,14 +67424,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "lightsout" @@ -69734,8 +67464,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69756,8 +67485,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark/start{ name = "Scientist" @@ -69799,15 +67527,6 @@ icon_state = "dark" }, /area/toxins/xenobiology) -"cSj" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/medical/research) "cSl" = ( /obj/machinery/light/small{ dir = 1 @@ -69832,9 +67551,9 @@ }, /area/medical/research) "cSn" = ( -/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 = "whitepurplecorner" @@ -69863,7 +67582,6 @@ }, /area/toxins/xenobiology) "cSr" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, @@ -69939,8 +67657,8 @@ }, /area/medical/medbay) "cSB" = ( -/obj/structure/disposalpipe/segment, /obj/item/twohanded/required/kirbyplants, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -69996,9 +67714,14 @@ }, /area/medical/medbay) "cSH" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70016,7 +67739,6 @@ /turf/simulated/floor/wood, /area/medical/psych) "cSJ" = ( -/obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -70029,14 +67751,17 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, +/obj/structure/closet/secure_closet/psychiatrist, +/obj/item/clipboard{ + pixel_x = -5 + }, /turf/simulated/floor/wood, /area/medical/psych) "cSL" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -70053,8 +67778,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -70083,8 +67807,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -70280,8 +68003,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 8 @@ -70303,25 +68025,23 @@ }, /area/toxins/xenobiology) "cTq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cTr" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -70333,8 +68053,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/window/brigdoor{ id = null; @@ -70360,14 +68079,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -70378,8 +68095,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -70396,14 +68112,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/camera{ c_tag = "Xenobio West"; @@ -70422,8 +68136,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, @@ -70453,8 +68166,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -70464,7 +68176,6 @@ }, /area/toxins/xenobiology) "cTB" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -70473,10 +68184,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/medical/research) "cTC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -70497,8 +68208,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -70567,31 +68277,43 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/clothing/mask/gas, +/obj/item/crowbar, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/monkeycubes, +/obj/item/stack/sheet/glass{ + amount = 50; + pixel_x = 3; + pixel_y = 3 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" +/obj/item/stack/sheet/metal{ + amount = 50 }, -/area/medical/research) +/obj/item/stack/sheet/mineral/plasma{ + layer = 2.9 + }, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "cTJ" = ( -/obj/structure/chair/comfy/purp, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/medical/research) -"cTL" = ( /obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) +"cTL" = ( /obj/machinery/light_switch{ pixel_x = 26 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" +/obj/machinery/camera{ + c_tag = "Research Chemistry"; + dir = 8; + network = list("Research","SS13","Security") }, -/area/medical/research) +/obj/machinery/chem_dispenser, +/obj/item/reagent_containers/glass/beaker/large, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "cTM" = ( /obj/machinery/processor{ desc = "A machine used to process slimes and retrieve their extract."; @@ -70630,15 +68352,15 @@ /turf/simulated/wall, /area/toxins/lab) "cTS" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id_tag = "researchdesk1"; - name = "Research Desk Shutters" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/toxins/lab) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/aft) "cTT" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -70656,7 +68378,6 @@ }, /area/medical/research) "cTV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, @@ -70669,7 +68390,6 @@ }, /area/hallway/primary/aft) "cTW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -70714,13 +68434,13 @@ /turf/simulated/floor/plasteel, /area/medical/medbay) "cUb" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; id_tag = "chemdesk1"; name = "Chemistry Desk Shutters" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/medical/medbay) "cUc" = ( @@ -70785,14 +68505,9 @@ network = list("Medical","SS13","Security") }, /obj/structure/cable, -/turf/simulated/floor/wood, -/area/medical/psych) -"cUh" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start{ - name = "Psychiatrist" - }, -/turf/simulated/floor/wood, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/simulated/floor/carpet, /area/medical/psych) "cUi" = ( /obj/machinery/light{ @@ -70802,7 +68517,7 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/medical/psych) "cUj" = ( /obj/machinery/light{ @@ -70836,7 +68551,8 @@ }, /area/medical/medbay3) "cUm" = ( -/obj/machinery/vending/medidrobe, +/obj/structure/closet/wardrobe/medical_white, +/obj/item/storage/backpack/satchel_med, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -70868,11 +68584,11 @@ }, /area/medical/medbay3) "cUq" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -70897,27 +68613,25 @@ /obj/machinery/defibrillator_mount/loaded{ pixel_y = 30 }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay3) "cUu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -70933,31 +68647,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/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{ - icon_state = "neutral" - }, -/area/maintenance/starboard) +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "cUw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -70969,14 +68665,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -70988,14 +68680,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71009,14 +68697,10 @@ }, /area/maintenance/starboard) "cUA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71024,17 +68708,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cUB" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"cUB" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -71045,14 +68728,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71067,14 +68746,10 @@ }, /area/maintenance/starboard) "cUD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71086,14 +68761,10 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cUE" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -71107,10 +68778,6 @@ }, /area/crew_quarters/fitness) "cUF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -71118,6 +68785,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -71204,19 +68872,10 @@ icon_state = "neutral" }, /area/maintenance/starboard) -"cUN" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "escape" - }, -/area/crew_quarters/fitness) "cUO" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cUP" = ( /obj/structure/mopbucket, @@ -71251,8 +68910,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -71267,8 +68925,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -71283,15 +68940,15 @@ }, /area/toxins/xenobiology) "cUV" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71313,10 +68970,10 @@ }, /area/toxins/xenobiology) "cUY" = ( -/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/medical/research) "cUZ" = ( @@ -71335,10 +68992,12 @@ }, /area/toxins/xenobiology) "cVc" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/northeast, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/hallway/primary/aft) "cVd" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -71347,11 +69006,9 @@ }, /area/medical/research) "cVe" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -71366,8 +69023,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Scientist" @@ -71389,25 +69045,19 @@ /turf/simulated/floor/plating, /area/toxins/xenobiology) "cVj" = ( -/obj/structure/table/wood, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cVl" = ( -/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 = 4; - icon_state = "whitepurple" - }, -/area/medical/research) +/obj/machinery/chem_master, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "cVm" = ( /obj/machinery/smartfridge/secure/extract, /obj/machinery/light_switch{ @@ -71423,8 +69073,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -71448,28 +69097,18 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) -"cVq" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) "cVr" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, /area/toxins/lab) "cVs" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/research) "cVt" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -71538,7 +69177,6 @@ /turf/simulated/floor/plating, /area/toxins/lab) "cVA" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -71601,31 +69239,27 @@ /obj/effect/landmark/start{ name = "Chemist" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/medical/chemistry) "cVI" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/chem_dispenser, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/plasteel, /area/medical/chemistry) -"cVJ" = ( -/obj/machinery/camera{ - c_tag = "Research Hallway North"; - dir = 8; - network = list("Research","SS13") - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "cVK" = ( +/obj/structure/closet/wardrobe/chemistry_white, /obj/effect/decal/warning_stripes/northwest, /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = 32 }, -/obj/machinery/vending/chemdrobe, /turf/simulated/floor/plasteel, /area/medical/chemistry) "cVL" = ( @@ -71678,25 +69312,17 @@ }, /area/medical/medbay) "cVQ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 5 - }, -/obj/item/pen/multi, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/medical/psych) "cVR" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/item/storage/briefcase, -/turf/simulated/floor/wood, +/obj/structure/bed/psych, +/turf/simulated/floor/carpet, /area/medical/psych) "cVS" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -71709,8 +69335,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -71760,17 +69385,16 @@ }, /area/assembly/robotics) "cWb" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light{ + dir = 1; + on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "cWc" = ( /turf/simulated/wall/rust, /area/medical/medbay3) @@ -71778,11 +69402,11 @@ /turf/simulated/wall, /area/medical/medbay3) "cWe" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -71813,10 +69437,7 @@ /area/crew_quarters/fitness) "cWi" = ( /obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cWj" = ( /obj/machinery/vending/coffee, @@ -71916,8 +69537,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71930,30 +69550,11 @@ icon_state = "neutral" }, /area/maintenance/port) -"cWu" = ( -/obj/machinery/camera{ - c_tag = "Research Break Room"; - dir = 8; - network = list("Research","SS13","Security") - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/medical/research) "cWv" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71979,8 +69580,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -72015,8 +69615,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -72033,12 +69632,12 @@ }, /area/toxins/xenobiology) "cWD" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cWE" = ( @@ -72114,10 +69713,12 @@ }, /area/toxins/xenobiology) "cWH" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/east, +/obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/medical/research) +/area/hallway/secondary/exit) "cWI" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -72128,8 +69729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72146,8 +69746,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -72182,37 +69781,30 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/micro_laser, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" }, /area/toxins/lab) "cWN" = ( -/obj/structure/chair/comfy/purp{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitepurple" + icon_state = "white" }, -/area/medical/research) -"cWO" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/medical/research) +/area/toxins/misc_lab) "cWP" = ( -/obj/structure/table/wood, -/obj/machinery/kitchen_machine/microwave{ - pixel_x = -3; - pixel_y = 6 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" +/obj/structure/reagent_dispensers/fueltank/chem{ + pixel_x = 32 }, -/area/medical/research) +/obj/machinery/chem_heater, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "cWQ" = ( /obj/machinery/r_n_d/destructive_analyzer, /obj/effect/decal/warning_stripes/northwest, @@ -72295,26 +69887,25 @@ }, /area/toxins/xenobiology) "cXb" = ( -/obj/structure/closet/emcloset, /obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = -29 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "cXc" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/research) "cXd" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Central Hallway South 1"; dir = 8 @@ -72346,14 +69937,15 @@ /area/medical/chemistry) "cXh" = ( /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/chemistry) "cXi" = ( +/obj/effect/decal/warning_stripes/southeast, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/medical/chemistry) "cXj" = ( @@ -72370,8 +69962,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -72462,8 +70053,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -72544,8 +70134,8 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cXF" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -72602,18 +70192,12 @@ "cXP" = ( /obj/structure/table/wood, /obj/item/stack/packageWrap, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cXQ" = ( /obj/structure/table/wood, /obj/item/camera, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cXR" = ( /obj/structure/reagent_dispensers/watertank, @@ -72624,8 +70208,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -72666,8 +70249,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -72676,8 +70258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -72687,8 +70268,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -72696,8 +70276,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72716,10 +70295,6 @@ }, /area/maintenance/port) "cYh" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/closet/wardrobe/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -72741,9 +70316,11 @@ /area/medical/research) "cYk" = ( /obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/medical/research) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "cYl" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -72764,6 +70341,7 @@ /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -72776,13 +70354,13 @@ /area/toxins/lab) "cYo" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_y = -32 }, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "white" }, -/area/medical/research) +/area/toxins/misc_lab) "cYq" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -72793,47 +70371,6 @@ /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/toxins/lab) -"cYs" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"cYt" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) -"cYu" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"cYv" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box/gloves, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplefull" - }, -/area/medical/research) "cYy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -72841,26 +70378,13 @@ }, /area/toxins/lab) "cYz" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/vending/scidrobe, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplefull" - }, -/area/medical/research) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/toxins/misc_lab) "cYA" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplefull" - }, -/area/medical/research) +/turf/simulated/wall, +/area/toxins/misc_lab) "cYB" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -72869,10 +70393,10 @@ /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/medical/research) "cYC" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "orangecorner" }, @@ -72904,6 +70428,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72975,9 +70500,14 @@ }, /area/medical/morgue) "cYO" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73015,8 +70545,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73099,12 +70628,10 @@ }, /area/maintenance/starboard) "cZd" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/examroom{ @@ -73177,8 +70704,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Gambling Den" @@ -73224,7 +70750,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cZr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -73250,6 +70775,7 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/effect/decal/warning_stripes/southeast, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -73258,15 +70784,6 @@ "cZt" = ( /turf/simulated/wall, /area/medical/research) -"cZu" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "cZv" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -73293,18 +70810,8 @@ /turf/simulated/wall, /area/medical/research) "cZy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73313,8 +70820,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73324,8 +70830,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/hologram/holopad{ pixel_x = -16 @@ -73409,8 +70914,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -73418,6 +70922,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73454,6 +70959,7 @@ "cZM" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -73472,8 +70978,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -73485,7 +70990,6 @@ }, /area/medical/medbay3) "cZR" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -73509,18 +71013,15 @@ }, /area/medical/medbay3) "cZT" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -73541,9 +71042,9 @@ }, /area/medical/medbay3) "cZV" = ( -/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 = "neutral" }, @@ -73666,8 +71167,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -73690,8 +71190,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -73707,8 +71206,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -73725,8 +71223,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -73740,8 +71237,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -73799,8 +71295,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -73809,6 +71304,9 @@ dir = 1; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -73818,14 +71316,12 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -73838,12 +71334,11 @@ }, /area/medical/research) "daB" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32; - pixel_y = 32 - }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "whitepurplecorner" }, /area/medical/research) @@ -73851,14 +71346,12 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; @@ -73872,11 +71365,11 @@ /turf/simulated/wall/rust, /area/toxins/xenobiology) "daE" = ( -/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; + dir = 1; icon_state = "whitepurplecorner" }, /area/medical/research) @@ -73886,8 +71379,8 @@ on = 1 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + dir = 1; + icon_state = "whitepurple" }, /area/medical/research) "daG" = ( @@ -73910,11 +71403,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/lab) "daI" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -73937,8 +71434,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/disk/tech_disk{ @@ -73970,9 +71466,6 @@ }, /area/hallway/primary/aft) "daO" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/structure/sign/chemistry{ pixel_x = 32; pixel_y = 32 @@ -73982,9 +71475,6 @@ }, /area/hallway/primary/aft) "daP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ @@ -73992,17 +71482,17 @@ }, /area/hallway/primary/aft) "daQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ dir = 8; - id_tag = "chemdesk2"; - name = "Chemistry Desk Shutters" + icon_state = "neutralfull" }, -/turf/simulated/floor/plating, -/area/medical/chemistry) +/area/hallway/secondary/exit) "daR" = ( /obj/item/crowbar, /obj/effect/decal/cleanable/dirt, @@ -74018,8 +71508,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -74045,8 +71534,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74066,11 +71554,11 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_one_access_txt = "5;33" }, /obj/machinery/door/window/westleft{ name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_access_txt = "33" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74102,9 +71590,14 @@ }, /area/medical/cmo) "dbb" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -74119,9 +71612,6 @@ }, /area/maintenance/starboardsolar) "dbd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/chem_dispenser, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -74144,6 +71634,7 @@ }, /area/medical/medbay) "dbj" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -74152,8 +71643,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -74189,12 +71679,10 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "dbq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/greencross{ @@ -74219,8 +71707,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -74278,8 +71765,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74294,12 +71780,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/apmaint) "dbD" = ( @@ -74311,8 +71797,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -74320,15 +71805,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/maintenance/gambling_den) "dbF" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -74336,6 +71819,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 = "dark" }, @@ -74351,8 +71835,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -74368,11 +71851,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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, /area/maintenance/apmaint) "dbJ" = ( @@ -74398,6 +71881,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -74424,27 +71908,26 @@ }, /area/medical/research) "dbR" = ( -/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, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "neutralfull" }, -/area/medical/research) +/area/hallway/secondary/exit) "dbS" = ( -/obj/structure/disposalpipe/segment{ +/obj/item/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/radio/beacon, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74469,41 +71952,37 @@ }, /area/toxins/lab) "dbV" = ( -/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/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) -"dbW" = ( -/obj/structure/disposalpipe/segment{ dir = 8; - icon_state = "pipe-c" + icon_state = "neutralfull" }, +/area/hallway/secondary/exit) +"dbW" = ( /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 = "Research Junction"; + sortType = 12 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "dbX" = ( -/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 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74515,6 +71994,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -74540,6 +72022,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 = "whitepurplecorner" @@ -74549,8 +72035,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Scientist" @@ -74598,11 +72083,11 @@ }, /area/hallway/primary/aft) "dcg" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/chemistry) "dch" = ( @@ -74628,6 +72113,11 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -74666,8 +72156,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74684,8 +72173,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -74699,8 +72187,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -74709,24 +72196,29 @@ }, /area/medical/medbay) "dcr" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -74739,8 +72231,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -74749,6 +72240,9 @@ dir = 4 }, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "white" @@ -74758,14 +72252,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -74774,6 +72266,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -74782,8 +72277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -74796,6 +72290,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74804,43 +72301,40 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /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 = "white" }, /area/medical/medbay) "dcy" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dcz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74860,14 +72354,10 @@ }, /area/maintenance/apmaint) "dcB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -74879,10 +72369,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dcC" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -74891,8 +72377,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -74909,14 +72394,13 @@ }, /area/maintenance/starboard) "dcD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical/glass{ - id_tag = ""; name = "Staff Room"; req_access_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/medbay3) "dcE" = ( @@ -74928,8 +72412,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74945,8 +72428,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74976,27 +72458,21 @@ "dcJ" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcK" = ( /obj/structure/table/wood, /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcL" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/restraints/handcuffs, /obj/item/grenade/smokebomb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcM" = ( /obj/machinery/light/small{ @@ -75008,8 +72484,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -75022,12 +72497,9 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dcQ" = ( /turf/simulated/floor/plasteel{ @@ -75056,24 +72528,18 @@ /area/hallway/primary/aft) "dcT" = ( /obj/structure/chair/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dcU" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/wood/poker, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dcV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75140,21 +72606,11 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dde" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "ddf" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -75188,9 +72644,8 @@ /area/toxins/lab) "ddk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -75220,11 +72675,11 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ddn" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ddo" = ( @@ -75284,8 +72739,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -75312,18 +72766,22 @@ }, /area/maintenance/apmaint) "ddw" = ( -/obj/structure/disposalpipe/segment, +/obj/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitepurplecorner" + icon_state = "neutralfull" }, -/area/medical/research) +/area/hallway/secondary/exit) "ddx" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75336,12 +72794,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "ddA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -75352,9 +72807,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "ddC" = ( /obj/effect/spawner/window/reinforced, @@ -75404,8 +72857,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -75470,7 +72922,7 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Chemistry Desk"; - req_access_txt = "5; 33" + req_one_access_txt = "5;33" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75480,8 +72932,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -75491,6 +72942,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75537,8 +72991,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" @@ -75548,8 +73001,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light_switch{ pixel_x = 4; @@ -75615,8 +73067,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -75627,15 +73078,14 @@ }, /area/maintenance/apmaint) "ddX" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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{ icon_state = "whitebluefull" }, @@ -75644,8 +73094,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -75677,8 +73126,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -75686,14 +73134,10 @@ }, /area/medical/medbay) "dec" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; @@ -75711,8 +73155,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75730,8 +73173,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -75757,8 +73199,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -75793,8 +73234,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/shower{ dir = 4 @@ -75835,9 +73275,7 @@ name = "xeno_spawn"; pixel_x = -1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dex" = ( /obj/structure/chair/office/dark{ @@ -75846,32 +73284,25 @@ /obj/effect/landmark{ name = "revenantspawn" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dey" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dez" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "deA" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 2; @@ -75899,8 +73330,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -75910,8 +73340,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -75931,8 +73360,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -75949,15 +73377,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -75973,8 +73399,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -76047,8 +73472,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -76063,8 +73487,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -76134,8 +73557,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -76171,8 +73593,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -76248,8 +73669,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -76267,8 +73687,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 2; @@ -76322,8 +73741,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -76335,7 +73753,6 @@ }, /area/assembly/chargebay) "dft" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -76353,8 +73770,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -76425,22 +73841,19 @@ }, /area/medical/medbay) "dfF" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Patient Room"; req_access_txt = "5" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/medbay) "dfG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -76451,8 +73864,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -76467,8 +73879,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -76497,8 +73908,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -76520,8 +73930,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /obj/structure/grille, @@ -76563,8 +73972,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -76591,8 +73999,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -76622,8 +74029,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76697,8 +74103,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76715,8 +74120,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76742,18 +74146,15 @@ /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "dgq" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -76762,8 +74163,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Xenobiology Maintenance"; @@ -76790,8 +74190,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -76805,7 +74204,6 @@ }, /area/medical/research) "dgw" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; @@ -76825,17 +74223,16 @@ }, /area/medical/medbay) "dgy" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /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{ icon_state = "white" }, @@ -76851,8 +74248,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -76863,7 +74259,6 @@ }, /area/medical/medbay) "dgC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, @@ -76970,6 +74365,8 @@ }, /area/medical/genetics_cloning) "dgM" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -77014,15 +74411,14 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "dgQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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{ icon_state = "white" }, @@ -77087,8 +74483,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -77148,8 +74543,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -77267,9 +74661,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dhx" = ( /obj/effect/landmark{ @@ -77310,8 +74702,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Experimentor Maintenance"; @@ -77338,8 +74729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -77367,8 +74757,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -77387,8 +74776,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -77413,8 +74801,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -77433,8 +74820,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -77446,15 +74832,10 @@ }, /area/toxins/explab) "dhL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77462,19 +74843,19 @@ /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 = "white" }, /area/toxins/explab) "dhM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77482,6 +74863,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77509,21 +74893,18 @@ }, /area/crew_quarters/hor) "dhQ" = ( -/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 = "white" }, /area/toxins/explab) "dhR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -77539,6 +74920,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77566,9 +74950,6 @@ }, /area/toxins/xenobiology) "dhT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/structure/chair/office/light, /obj/effect/landmark/start{ @@ -77581,14 +74962,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) "dhU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/white, @@ -77600,14 +74981,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) "dhV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77615,14 +74996,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/toxins/explab) "dhW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77630,6 +75011,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77647,9 +75031,6 @@ }, /area/medical/research) "dhY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77657,12 +75038,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/medical/research) -"dhZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/medical/research) +"dhZ" = ( /obj/effect/landmark{ name = "lightsout" }, @@ -77675,43 +75056,44 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "dia" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "dib" = ( +/obj/effect/decal/warning_stripes/east, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/medical/research) "dic" = ( +/obj/effect/decal/warning_stripes/west, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "did" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "die" = ( @@ -77727,8 +75109,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -77738,8 +75119,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -77761,26 +75141,25 @@ }, /area/medical/research) "dii" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Robotics Junction"; - sortType = 13 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "dij" = ( /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "dark" }, -/area/medical/research) +/area/chapel/office) "dik" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -77819,8 +75198,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -77836,8 +75214,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -77846,8 +75223,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -77886,7 +75262,6 @@ }, /area/assembly/chargebay) "diu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Central Hallway South 2"; dir = 4 @@ -77923,8 +75298,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -77965,8 +75339,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77981,6 +75354,9 @@ /area/maintenance/apmaint) "diE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77991,6 +75367,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -78007,8 +75386,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -78016,27 +75394,31 @@ name = "Medbay Cloning"; req_access_txt = "5" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" }, /area/medical/genetics_cloning) "diI" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /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{ icon_state = "white" }, @@ -78045,8 +75427,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -78111,8 +75495,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -78201,9 +75584,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "djb" = ( /obj/structure/table/reinforced, @@ -78218,8 +75599,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, @@ -78236,8 +75616,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/girder, /obj/structure/grille, @@ -78266,8 +75645,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -78285,8 +75663,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -78315,8 +75692,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -78333,8 +75709,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -78360,8 +75735,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -78516,33 +75890,30 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "djG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; - tag = "90Curve" + tag = null + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -78550,20 +75921,15 @@ }, /area/crew_quarters/hor) "djH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -78571,20 +75937,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" }, /area/crew_quarters/hor) "djI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -78592,34 +75957,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) "djJ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "djK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -78632,19 +75995,18 @@ req_access = null; req_access_txt = "30" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/crew_quarters/hor) "djL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -78652,21 +76014,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/medical/research) "djM" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; @@ -78676,6 +76036,11 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + name = "RD Junction 1"; + sortType = 13 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78705,8 +76070,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Paramedic's maintenance"; @@ -78781,6 +76145,10 @@ dir = 1; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78790,6 +76158,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78801,6 +76172,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -78821,24 +76195,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" }, /area/medical/medbay) "dkg" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Genetics Junction"; + sortType = 23 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78863,6 +76244,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -78948,8 +76332,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /obj/structure/grille, @@ -78984,12 +76367,12 @@ }, /area/medical/research) "dkx" = ( +/obj/machinery/light, +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/light, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -79053,10 +76436,6 @@ /turf/simulated/wall/r_wall, /area/toxins/explab) "dkF" = ( -/obj/machinery/status_display, -/turf/simulated/wall/r_wall, -/area/toxins/explab) -"dkH" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "experimentor"; name = "Experimentor Blast Door" @@ -79064,6 +76443,10 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/toxins/explab) +"dkH" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/toxins/mixing) "dkI" = ( /turf/simulated/wall/r_wall, /area/toxins/mixing) @@ -79076,22 +76459,22 @@ /turf/simulated/floor/plating, /area/toxins/mixing) "dkL" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "RD Junction 2"; + sortType = 13 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -79105,8 +76488,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/engine, /area/toxins/misc_lab) @@ -79117,14 +76499,10 @@ /turf/simulated/floor/engine, /area/toxins/misc_lab) "dkQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -79133,6 +76511,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -79151,8 +76532,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair/office/light, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -79177,14 +76557,10 @@ }, /area/crew_quarters/hor) "dkU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -79203,6 +76579,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79220,8 +76599,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -79231,12 +76609,12 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "dkX" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -79308,7 +76686,6 @@ }, /area/medical/medbay) "dle" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -79403,6 +76780,7 @@ "dlq" = ( /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" }, @@ -79455,8 +76833,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -79483,7 +76860,6 @@ /turf/simulated/wall, /area/medical/surgery) "dlA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -79491,6 +76867,7 @@ dir = 10; initialize_directions = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -79503,10 +76880,7 @@ dir = 4 }, /obj/machinery/vending/artvend, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "escape" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "dlD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -79522,9 +76896,9 @@ }, /area/hallway/secondary/exit) "dlE" = ( -/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 = "whitebluecorner" @@ -79534,8 +76908,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -79557,8 +76930,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ @@ -79595,8 +76967,8 @@ /turf/simulated/floor/engine, /area/toxins/explab) "dlP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/toxins/explab) @@ -79613,13 +76985,19 @@ }, /area/toxins/mixing) "dlS" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" }, /area/toxins/mixing) "dlT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; @@ -79627,13 +77005,15 @@ }, /area/toxins/mixing) "dlU" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" }, /area/toxins/mixing) "dlV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; @@ -79645,6 +77025,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -79657,6 +77038,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79665,31 +77047,27 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/toxins/misc_lab) "dlY" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/atmospherics/binary/pump{ + dir = 8 }, -/obj/structure/closet/bombcloset, -/obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" }, /area/toxins/mixing) "dlZ" = ( -/obj/structure/closet/bombcloset, +/obj/structure/closet/secure_closet/scientist, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 26 }, -/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -79699,8 +77077,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79710,8 +77087,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -79753,7 +77129,6 @@ /turf/simulated/floor/greengrid, /area/assembly/chargebay) "dmh" = ( -/obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -79888,9 +77263,9 @@ }, /area/medical/surgeryobs) "dmA" = ( -/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" }, @@ -79916,8 +77291,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -79994,8 +77368,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -80025,9 +77398,7 @@ /area/maintenance/gambling_den) "dmQ" = ( /obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dmR" = ( /obj/item/twohanded/required/kirbyplants, @@ -80105,8 +77476,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -80116,41 +77486,66 @@ /area/maintenance/port) "dnc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/engine, -/area/toxins/explab) -"dnd" = ( -/mob/living/simple_animal/pet/dog/pug, -/turf/simulated/floor/engine, -/area/toxins/explab) -"dne" = ( -/obj/effect/landmark{ - name = "revenantspawn" - }, -/turf/simulated/floor/engine, -/area/toxins/explab) -"dnf" = ( /obj/machinery/r_n_d/experimentor, /turf/simulated/floor/engine, /area/toxins/explab) +"dnd" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/security/brig) +"dne" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/ntrep) +"dnf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/ntrep) "dng" = ( /turf/simulated/floor/engine, /area/toxins/explab) "dnh" = ( -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 }, /turf/simulated/floor/engine, -/area/toxins/explab) +/area/toxins/mixing) "dni" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/toxins/misc_lab) "dnj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 11 @@ -80160,17 +77555,16 @@ }, /area/toxins/mixing) "dnk" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -80207,8 +77601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -80226,8 +77619,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/office/light{ dir = 1; @@ -80241,15 +77633,14 @@ }, /area/crew_quarters/hor) "dnr" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 }, -/obj/structure/closet/secure_closet/scientist, +/obj/machinery/computer/general_air_control{ + frequency = 1222; + name = "Bomb Mix Monitor"; + sensors = list("burn_sensor" = "Burn Mix") + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -80271,8 +77662,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -80309,7 +77699,6 @@ }, /area/assembly/chargebay) "dnC" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -80317,12 +77706,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dnE" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "purplecorner" - }, -/area/hallway/primary/aft) "dnF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -80343,7 +77726,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/vending/genedrobe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -80406,6 +77788,7 @@ name = "Genetics"; req_access_txt = "9" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80510,14 +77893,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -80560,8 +77941,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80595,7 +77975,6 @@ }, /area/medical/surgeryobs) "doi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 @@ -80608,6 +77987,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80649,8 +78029,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80758,8 +78137,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -80791,14 +78169,16 @@ /area/medical/chemistry) "doD" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 9 + }, /turf/simulated/floor/engine, -/area/toxins/explab) +/area/toxins/mixing) "doE" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -80823,11 +78203,11 @@ pixel_x = 29; pixel_y = 22 }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/structure/closet/secure_closet/scientist, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -80855,8 +78235,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/mecha, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -80868,8 +78247,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -80880,8 +78258,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -80903,7 +78280,11 @@ /obj/machinery/atmospherics/unary/thermomachine/heater{ dir = 8 }, -/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 28 + }, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -80932,7 +78313,6 @@ }, /area/assembly/chargebay) "doS" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -80959,8 +78339,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Cyborg" @@ -80983,7 +78362,6 @@ /turf/simulated/floor/greengrid, /area/assembly/chargebay) "doY" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -80998,11 +78376,6 @@ }, /area/hallway/primary/aft) "dpa" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Genetics Junction"; - sortType = 13 - }, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -81029,9 +78402,6 @@ }, /area/assembly/chargebay) "dpd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -81041,14 +78411,10 @@ }, /area/medical/genetics) "dpe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -81117,6 +78483,7 @@ "dpm" = ( /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" }, @@ -81137,18 +78504,15 @@ /turf/simulated/floor/grass, /area/medical/genetics) "dpr" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -81158,6 +78522,11 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "CMO's Junction"; + sortType = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81166,8 +78535,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -81175,6 +78543,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -81186,8 +78557,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -81195,6 +78565,10 @@ /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 = "dark" }, @@ -81203,14 +78577,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -81227,8 +78599,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -81246,8 +78617,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81258,8 +78628,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -81269,8 +78638,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -81280,8 +78648,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/command/glass{ name = "Chief Medical Officer"; @@ -81293,6 +78660,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81301,8 +78671,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81313,14 +78682,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark{ name = "lightsout" @@ -81352,6 +78719,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/obj/item/stack/medical/bruise_pack/advanced{ + pixel_x = -5; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -81362,7 +78738,6 @@ }, /area/medical/surgeryobs) "dpI" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -81370,6 +78745,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 = "dark" }, @@ -81437,8 +78813,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -81508,8 +78883,16 @@ dir = 8 }, /obj/machinery/portable_atmospherics/scrubber, -/obj/structure/sign/nosmoking_2{ - pixel_x = -32 +/obj/machinery/door_control{ + id = "toxmix1"; + name = "Space Vent"; + pixel_x = -32; + req_access_txt = "47" + }, +/obj/machinery/ignition_switch{ + id = "toxinsigniter"; + pixel_x = -32; + pixel_y = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -81631,8 +79014,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -81677,8 +79059,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -81704,8 +79085,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -81715,8 +79095,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/command/glass{ name = "Chief Medical Officer"; @@ -81727,17 +79106,11 @@ }, /area/medical/cmo) "dqw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/genetics) "dqx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -81747,9 +79120,6 @@ }, /area/medical/genetics) "dqz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -81758,9 +79128,6 @@ }, /area/medical/genetics) "dqA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Geneticist" @@ -81771,15 +79138,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics) "dqB" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -81805,15 +79169,14 @@ }, /area/medical/medbay) "dqF" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" }, @@ -81833,8 +79196,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81930,8 +79292,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -81986,9 +79347,7 @@ /area/maintenance/gambling_den) "drd" = ( /obj/structure/table/wood/poker, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dre" = ( /obj/structure/table/wood/poker, @@ -82053,6 +79412,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, +/obj/structure/sign/nosmoking_2{ + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -82070,20 +79432,19 @@ /turf/simulated/floor/plating, /area/maintenance/port) "drp" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/machinery/button/windowtint{ + pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/port) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood, +/area/ntrep) "drr" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/pump, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -82108,8 +79469,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -82168,8 +79528,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -82204,8 +79563,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -82230,9 +79588,6 @@ }, /area/assembly/chargebay) "drH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/genetics) @@ -82265,7 +79620,6 @@ }, /area/hallway/primary/aft) "drL" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sign/science{ pixel_x = -32; pixel_y = 32 @@ -82276,7 +79630,6 @@ }, /area/hallway/primary/aft) "drM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sign/science{ pixel_x = 32; pixel_y = 32 @@ -82289,13 +79642,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /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" }, @@ -82313,8 +79666,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -82372,13 +79724,6 @@ icon_state = "white" }, /area/medical/genetics) -"drY" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/medical/genetics) "drZ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -82419,6 +79764,7 @@ name = "kitty basket" }, /mob/living/simple_animal/pet/cat/Runtime, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82427,8 +79773,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -82449,8 +79794,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/chair/office/light, /turf/simulated/floor/plasteel{ @@ -82497,8 +79841,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 8 @@ -82512,8 +79855,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -82564,8 +79906,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82573,7 +79914,6 @@ }, /area/maintenance/port) "dsu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -82594,8 +79934,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -82610,8 +79949,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -82642,8 +79980,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -82653,8 +79990,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Research Director" @@ -82686,8 +80022,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -82699,7 +80034,6 @@ }, /area/assembly/robotics) "dsI" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -82801,8 +80135,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82842,9 +80175,6 @@ }, /area/medical/genetics) "dsU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Genetics Office"; @@ -82875,18 +80205,21 @@ /obj/structure/mirror{ pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics) "dsY" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/newscaster{ pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -82915,31 +80248,18 @@ }, /area/medical/medbay) "dtc" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/medical/medbay) -"dtd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "dte" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ @@ -82949,11 +80269,11 @@ /turf/simulated/floor/plasteel, /area/gateway) "dtf" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/genetics) "dtg" = ( @@ -82976,14 +80296,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/glass, /obj/item/paper_bin, @@ -82998,8 +80316,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -83021,8 +80338,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -83057,8 +80373,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -83086,7 +80401,6 @@ /turf/simulated/wall/r_wall, /area/medical/research) "dtq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /obj/structure/cable{ d1 = 1; @@ -83095,6 +80409,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -83104,8 +80419,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark/start{ name = "Medical Doctor" @@ -83142,8 +80456,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; @@ -83161,8 +80474,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -83170,8 +80482,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -83188,8 +80499,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -83200,32 +80510,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction) -"dtC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/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{ - icon_state = "white" - }, -/area/medical/medbay) "dtD" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -83243,8 +80532,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -83254,8 +80542,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/item/radio/intercom{ pixel_y = 28 @@ -83296,9 +80583,7 @@ /area/maintenance/gambling_den) "dtK" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dtL" = ( /obj/machinery/light/small, @@ -83354,13 +80639,9 @@ }, /area/toxins/mixing) "dtS" = ( -/obj/machinery/camera{ - c_tag = "Research Hallway"; - network = list("Research","SS13") - }, /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "whitepurplecorner" }, /area/medical/research) @@ -83375,8 +80656,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -83429,8 +80709,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -83450,18 +80729,11 @@ icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) -"duc" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/medical/research) "due" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -83550,17 +80822,16 @@ /turf/simulated/wall, /area/medical/morgue) "dul" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83573,8 +80844,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -83582,6 +80852,7 @@ req_access_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/medical/morgue) "dur" = ( @@ -83611,8 +80882,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -83750,8 +81020,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -83796,8 +81065,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -83817,8 +81085,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -83916,22 +81183,21 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Robotics Maintenance"; req_access_txt = "29" }, /obj/effect/decal/warning_stripes/south, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/fpmaint2) "dva" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -83959,8 +81225,8 @@ /turf/simulated/wall/r_wall, /area/toxins/misc_lab) "dve" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 10 +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83993,16 +81259,15 @@ }, /area/medical/research) "dvj" = ( -/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 = "whitepurplecorner" }, @@ -84011,8 +81276,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -84021,8 +81285,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -84089,8 +81352,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -84160,11 +81422,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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/plating, /area/medical/morgue) "dvE" = ( @@ -84198,8 +81460,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -84286,10 +81547,10 @@ /turf/simulated/floor/plating, /area/medical/research) "dvQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -84326,8 +81587,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -84335,6 +81595,7 @@ /area/maintenance/port) "dvX" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -84409,8 +81670,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -84420,8 +81680,8 @@ /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "dwe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/purple{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84540,8 +81800,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -84567,7 +81826,6 @@ }, /area/hallway/primary/aft) "dwu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Central Hallway South 3"; dir = 8 @@ -84591,8 +81849,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -84635,12 +81892,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/medical/morgue) "dwF" = ( @@ -84743,8 +82000,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -84795,9 +82051,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dwU" = ( /turf/simulated/floor/plasteel{ @@ -84809,9 +82063,7 @@ dir = 8; name = "Abandoned Theater" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dwW" = ( /obj/item/twohanded/required/kirbyplants, @@ -84953,8 +82205,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -85063,14 +82314,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -85083,8 +82332,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -85097,8 +82345,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/command{ name = "Server Room"; @@ -85113,8 +82360,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -85125,15 +82371,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85144,22 +82389,19 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "dxA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/medbay) "dxB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; @@ -85171,15 +82413,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/assembly/robotics) "dxC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85187,6 +82428,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Robotics Junction"; + sortType = 14 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85195,8 +82441,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -85205,6 +82450,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dxE" = ( @@ -85219,8 +82468,9 @@ }, /area/medical/research) "dxF" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -85230,8 +82480,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -85245,9 +82494,8 @@ }, /area/medical/morgue) "dxH" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85262,8 +82510,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -85271,6 +82518,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85280,8 +82530,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85289,6 +82538,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" @@ -85305,13 +82557,15 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85321,8 +82575,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85330,6 +82583,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85349,8 +82605,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85358,14 +82613,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/morgue) "dxR" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -85377,14 +82634,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/morgue) "dxS" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85393,20 +82652,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/morgue) "dxT" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -85417,6 +82677,10 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85432,8 +82696,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -85473,8 +82736,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -85489,12 +82751,12 @@ }, /area/medical/medbay) "dya" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Operating Theatre Storage"; req_access_txt = "45" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -85515,8 +82777,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85538,8 +82799,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) @@ -85588,13 +82848,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/detectives_office) "dyn" = ( /turf/simulated/wall/r_wall, @@ -85660,8 +82917,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -85679,7 +82935,8 @@ "dyy" = ( /obj/machinery/driver_button{ id_tag = "toxinsdriver"; - pixel_x = -26 + pixel_x = -26; + range = 18 }, /obj/structure/chair/office/dark{ dir = 8 @@ -85698,8 +82955,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85726,8 +82982,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -85760,8 +83015,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -85810,22 +83064,22 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" }, /area/medical/research) "dyM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/rack, /obj/item/storage/firstaid, /obj/item/storage/firstaid, /obj/item/paicard, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85834,13 +83088,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dyO" = ( @@ -85878,11 +83132,11 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "dyU" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -85892,8 +83146,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -85929,8 +83182,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85947,9 +83199,6 @@ /turf/simulated/floor/plasteel, /area/medical/morgue) "dzi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -85961,8 +83210,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -86005,8 +83256,8 @@ }, /area/medical/cmo) "dzm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -86034,9 +83285,7 @@ /obj/machinery/light_switch{ pixel_x = -26 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dzr" = ( /obj/structure/chair/wood{ @@ -86106,8 +83355,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -86143,8 +83391,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/research{ name = "Toxin Mixing"; @@ -86163,8 +83410,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -86181,8 +83427,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light_switch{ pixel_x = -26; @@ -86218,8 +83463,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -86240,14 +83484,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -86259,8 +83501,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -86310,8 +83551,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -86328,8 +83568,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -86348,8 +83587,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -86444,8 +83682,9 @@ d1 = 1; d2 = 4; icon_state = "1-4"; - tag = "90Curve" + tag = null }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86465,10 +83704,6 @@ }, /area/medical/research) "dzV" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -86479,6 +83714,10 @@ pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86487,16 +83726,15 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/southwest, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dzX" = ( @@ -86610,8 +83848,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -86621,8 +83858,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -86637,6 +83873,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -86681,8 +83920,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -86697,24 +83935,21 @@ }, /area/medical/medbay) "dAu" = ( -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-y" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/medical/surgery2) "dAv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Medbay Surgery East Storage"; dir = 1 @@ -86722,16 +83957,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/medical/surgery2) "dAw" = ( +/obj/machinery/iv_drip, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -86743,14 +83981,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -86766,31 +84002,25 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dAB" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dAC" = ( /obj/structure/cable{ @@ -86801,17 +84031,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dAD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dAE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -86833,8 +84059,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -86850,8 +84075,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/west, @@ -86915,8 +84139,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86952,8 +84175,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -86963,12 +84185,10 @@ "dAU" = ( /obj/machinery/door/window/southright{ dir = 1; - name = "Toxins Launcher"; - req_access_txt = "7" + name = "Toxins Launcher" }, /obj/machinery/door/window/southright{ - name = "Toxins Launcher"; - req_access_txt = "7" + name = "Toxins Launcher" }, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, @@ -86978,8 +84198,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -86991,8 +84210,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -87098,12 +84316,10 @@ }, /area/toxins/server) "dBh" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -87113,10 +84329,10 @@ /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/medical/research) "dBj" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -87124,9 +84340,9 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -87139,8 +84355,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, @@ -87151,11 +84366,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; + name = "Virology Lobby"; req_access_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -87172,9 +84386,7 @@ }, /area/medical/medbay) "dBq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dBr" = ( /obj/structure/chair/wood{ @@ -87185,11 +84397,11 @@ }, /area/crew_quarters/theatre) "dBt" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87242,18 +84454,15 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dBD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -87288,8 +84497,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -87298,8 +84506,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -87322,8 +84529,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -87333,19 +84539,17 @@ }, /area/hallway/primary/aft) "dBQ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -87360,9 +84564,6 @@ }, /area/hallway/primary/aft) "dBS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ id_tag = null; @@ -87370,6 +84571,9 @@ opacity = 1; req_access_txt = "6" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87378,8 +84582,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87394,8 +84597,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -87403,8 +84605,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -87413,14 +84614,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -87428,8 +84627,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -87441,8 +84639,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, @@ -87451,8 +84648,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -87464,8 +84660,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -87477,8 +84672,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -87489,8 +84683,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -87505,8 +84698,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -87527,8 +84719,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -87664,14 +84855,12 @@ /turf/simulated/wall/indestructible/riveted, /area/toxins/test_area) "dCz" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - dir = 4; - invuln = 1; - network = list("SS13,Toxins") - }, /obj/item/target, +/obj/machinery/camera{ + c_tag = "Research Toxins Test Chamber East"; + dir = 4; + network = list("Toxins","Research","SS13") + }, /turf/simulated/floor/plasteel/airless/indestructible, /area/toxins/test_area) "dCA" = ( @@ -87691,8 +84880,9 @@ /area/toxins/mixing) "dCD" = ( /obj/machinery/door/poddoor{ - id_tag = "toxindriver"; - name = "Toxins Podlock" + id_tag = "toxinsdriver"; + name = "Toxins Launcher Bay Door"; + protected = 0 }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -87703,7 +84893,7 @@ "dCF" = ( /obj/machinery/mass_driver{ dir = 8; - id_tag = "toxindriver" + id_tag = "toxinsdriver" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating/airless, @@ -87798,14 +84988,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -87813,14 +85001,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/apmaint) "dCW" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87835,8 +85023,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87878,12 +85065,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dDb" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -87904,19 +85089,24 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/aft) "dDd" = ( -/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 = "neutralcorner" }, @@ -88031,8 +85221,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88082,8 +85271,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88097,8 +85285,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88113,8 +85300,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -88141,14 +85327,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -88160,8 +85344,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88178,8 +85361,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88194,8 +85376,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88212,8 +85393,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88227,8 +85407,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88273,9 +85452,7 @@ /area/crew_quarters/theatre) "dDJ" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dDK" = ( /obj/item/twohanded/required/kirbyplants, @@ -88283,9 +85460,7 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "dDL" = ( /obj/machinery/vending/cigarette, @@ -88338,8 +85513,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -88352,8 +85526,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -88361,8 +85534,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -88378,8 +85550,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -88387,8 +85558,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88415,26 +85585,29 @@ "dEl" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dEm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dEn" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -88507,8 +85680,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -88592,8 +85764,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -88625,8 +85796,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88672,16 +85842,8 @@ }, /area/maintenance/apmaint) "dER" = ( -/obj/machinery/camera{ - c_tag = "Experimention Lab"; - dir = 1; - network = list("Research","SS13") - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) +/turf/simulated/wall, +/area/hallway/primary/central/south) "dES" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -88752,6 +85914,11 @@ "dEZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dFa" = ( @@ -88787,8 +85954,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" @@ -88826,8 +85992,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, @@ -88874,14 +86039,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "blobstart" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dFu" = ( @@ -88996,8 +86161,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -89108,9 +86272,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dGa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; @@ -89136,12 +86297,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dGh" = ( @@ -89153,6 +86314,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -89161,15 +86326,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/primary/aft) "dGm" = ( +/obj/machinery/vending/snack, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/vending/snack, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dGn" = ( @@ -89217,14 +86387,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -89255,8 +86423,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -89310,8 +86477,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ @@ -89390,8 +86556,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -89459,6 +86624,7 @@ }, /area/hallway/primary/aft) "dGT" = ( +/obj/structure/closet/wardrobe/robotics_black, /obj/structure/window/reinforced{ dir = 4 }, @@ -89467,13 +86633,11 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/vending/robodrobe, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/assembly/robotics) "dGU" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -89497,8 +86661,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -89532,8 +86695,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/access_button{ command = "cycle_interior"; @@ -89558,8 +86720,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/airlock/access_controller{ id_tag = "viro_lab_airlock_control"; @@ -89581,14 +86742,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/light/small{ dir = 1 @@ -89607,14 +86766,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/medical/virology) @@ -89622,8 +86779,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -89636,8 +86792,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -89648,14 +86803,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -89706,8 +86859,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/bed, /obj/item/bedsheet/medical, @@ -89749,9 +86901,7 @@ "dHt" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb2, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dHu" = ( /obj/structure/table/wood, @@ -89802,14 +86952,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -89824,8 +86972,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -89849,8 +86996,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -89864,8 +87010,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -89881,8 +87026,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89897,14 +87041,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -89923,8 +87065,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -89941,8 +87082,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -89959,8 +87099,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89979,8 +87118,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -89991,6 +87129,7 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dHN" = ( @@ -90024,11 +87163,10 @@ }, /area/assembly/robotics) "dHS" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/vending/cigarette, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dHT" = ( @@ -90051,14 +87189,17 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dHX" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/mirror{ pixel_x = -32 @@ -90110,8 +87251,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -90137,16 +87277,15 @@ }, /area/maintenance/port) "dIg" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Research Toxins Mixing North"; dir = 4; network = list("Research","SS13"); pixel_y = -22 }, -/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -90163,7 +87302,6 @@ /turf/simulated/floor/engine, /area/toxins/misc_lab) "dIi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Research Central Hall"; dir = 8; @@ -90188,8 +87326,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90206,8 +87343,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical{ name = "Virology Bedroom"; @@ -90225,8 +87361,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90248,8 +87383,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90276,15 +87410,11 @@ "dIp" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dIq" = ( /obj/structure/bookcase, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dIr" = ( /obj/effect/landmark{ @@ -90297,17 +87427,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library/abandoned) "dIu" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dIv" = ( /obj/effect/landmark{ @@ -90339,6 +87466,10 @@ "dIC" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/wardrobe/toxins_white, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -90357,13 +87488,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dIH" = ( @@ -90371,13 +87502,17 @@ /area/hallway/secondary/exit) "dII" = ( /obj/structure/cable, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/effect/decal/warning_stripes/south, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dIJ" = ( -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/effect/decal/warning_stripes/south, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, @@ -90400,8 +87535,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Mech Lab"; @@ -90435,8 +87569,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -90451,8 +87584,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -90471,8 +87603,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90487,8 +87618,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -90498,8 +87628,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90515,8 +87644,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -90557,8 +87685,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -90604,8 +87731,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/wood{ broken = 1; @@ -90616,19 +87742,15 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "4-8" }, +/turf/simulated/floor/wood, /area/library/abandoned) "dJo" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -90710,12 +87832,15 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dJC" = ( @@ -90723,6 +87848,11 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Chapel Junction"; + sortType = 17 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dJD" = ( @@ -90798,8 +87928,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -90835,8 +87964,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ @@ -90867,15 +87995,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/virology) "dJZ" = ( -/obj/machinery/vending/virodrobe, +/obj/structure/closet/wardrobe/virology_white, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90975,8 +88102,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91012,8 +88138,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, @@ -91030,8 +88155,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91052,8 +88176,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -91085,8 +88208,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -91099,8 +88221,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -91165,8 +88286,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91193,8 +88313,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91203,14 +88322,14 @@ }, /area/chapel/main) "dKO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "Chapel"; opacity = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91230,18 +88349,15 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dKV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark/start{ name = "Medical Doctor" @@ -91254,6 +88370,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91262,14 +88379,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -91287,8 +88402,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Crematorium Maintenance"; @@ -91304,8 +88418,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -91331,8 +88444,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -91372,8 +88484,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -91466,8 +88577,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91498,8 +88608,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark/start{ name = "Chaplain" @@ -91530,8 +88639,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; @@ -91557,13 +88665,13 @@ }, /area/chapel/main) "dLx" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -91577,9 +88685,6 @@ }, /area/chapel/main) "dLz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -91588,31 +88693,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLA" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLD" = ( -/obj/machinery/door/airlock/public/glass, -/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/effect/decal/warning_stripes/south, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91628,8 +88738,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91640,8 +88749,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -91652,8 +88760,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -91670,8 +88777,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -91700,7 +88806,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLP" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/structure/cable{ d1 = 1; @@ -91716,6 +88821,7 @@ /obj/machinery/holosign/surgery{ id = "surgery2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91743,19 +88849,20 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen" + dir = 8; + icon_state = "neutralfull" }, -/area/medical/virology) +/area/hallway/primary/central/south) "dLU" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -91766,8 +88873,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -91794,15 +88900,11 @@ dir = 4; pixel_x = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dMd" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dMe" = ( /obj/item/twohanded/required/kirbyplants, @@ -91885,9 +88987,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -91898,13 +88997,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMs" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -91930,8 +89022,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -91939,15 +89030,10 @@ }, /area/medical/virology) "dMx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -91957,8 +89043,11 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -91966,14 +89055,10 @@ }, /area/medical/virology) "dMy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -91981,19 +89066,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dMz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -92003,8 +89087,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92012,6 +89095,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -92021,8 +89107,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/clothing/gloves/color/latex, @@ -92035,20 +89120,15 @@ }, /area/medical/virology) "dMB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -92066,19 +89146,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dMC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92086,21 +89165,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" }, /area/medical/virology) "dMD" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -92115,6 +89192,10 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92150,9 +89231,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dMJ" = ( /obj/structure/chair/office/dark, @@ -92194,8 +89273,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -92242,8 +89320,8 @@ }, /area/chapel/main) "dMW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/wood, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "chapel" @@ -92302,8 +89380,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/computer/pandemic, /obj/effect/decal/warning_stripes/southeast, @@ -92325,13 +89402,12 @@ }, /area/medical/virology) "dNk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -92356,8 +89432,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -92389,8 +89464,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92431,9 +89505,7 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dNz" = ( /obj/item/twohanded/required/kirbyplants, @@ -92445,16 +89517,12 @@ /area/library/abandoned) "dNA" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dNB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dNC" = ( /obj/machinery/light/small, @@ -92464,9 +89532,7 @@ "dND" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/library/abandoned) "dNE" = ( /obj/structure/table/wood, @@ -92498,8 +89564,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/newscaster{ pixel_x = 32 @@ -92525,8 +89590,8 @@ }, /area/chapel/main) "dNM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/wood, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "chapel" @@ -92609,8 +89674,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -92634,8 +89698,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ @@ -92655,12 +89718,10 @@ }, /area/medical/virology) "dOe" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -92670,6 +89731,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92678,8 +89740,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92696,8 +89757,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical{ name = "Virology"; @@ -92715,14 +89775,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92739,8 +89797,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92756,8 +89813,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -92777,8 +89833,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -92795,14 +89850,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/table/glass, /obj/item/folder/white, @@ -92829,8 +89882,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -92845,8 +89897,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/centcom{ name = "Chapel Morgue"; @@ -92933,7 +89984,7 @@ d1 = 1; d2 = 4; icon_state = "1-4"; - tag = "90Curve" + tag = null }, /turf/simulated/floor/plating, /area/medical/virology) @@ -92967,15 +90018,14 @@ }, /area/medical/virology) "dOH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" }, @@ -92984,8 +90034,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/sink{ dir = 8; @@ -93027,8 +90076,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/paper_bin, @@ -93062,8 +90110,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -93102,8 +90149,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -93114,8 +90160,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -93172,12 +90217,10 @@ }, /area/medical/virology) "dPk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/crowbar, @@ -93190,6 +90233,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -93210,7 +90254,6 @@ }, /area/medical/virology) "dPn" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -93218,6 +90261,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 = "whiteblue" }, @@ -93242,8 +90286,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plasteel{ @@ -93255,8 +90298,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plating, @@ -93265,31 +90307,35 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/apmaint) "dPu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dPv" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -93306,8 +90352,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -93321,8 +90366,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -93339,8 +90383,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -93358,14 +90401,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; @@ -93380,14 +90421,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -93405,8 +90444,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -93451,8 +90489,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/crema_switch{ pixel_x = 26 @@ -93505,10 +90542,10 @@ /turf/simulated/wall/r_wall/rust, /area/medical/virology) "dPT" = ( -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/medical/virology) "dPU" = ( @@ -93580,8 +90617,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -93592,6 +90628,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" @@ -93624,8 +90663,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/command/glass{ @@ -93651,8 +90689,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 4 @@ -93725,7 +90762,6 @@ }, /area/assembly/robotics) "dQr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -93735,6 +90771,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -93743,8 +90780,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -93769,8 +90805,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -93780,8 +90815,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, /obj/effect/decal/warning_stripes/east, @@ -93791,14 +90825,10 @@ }, /area/medical/virology) "dQw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -93807,6 +90837,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -93906,8 +90939,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/reagent_containers/spray/cleaner, @@ -93947,8 +90979,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -93964,8 +90995,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -94009,8 +91039,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -94036,14 +91065,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -94088,8 +91115,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -94148,8 +91174,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -94162,8 +91187,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ name = "Aft Port Solar Access"; @@ -94179,8 +91203,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/storage/box/beakers, @@ -94204,17 +91227,16 @@ }, /area/medical/virology) "dRh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/northeast, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" @@ -94235,8 +91257,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -94326,8 +91347,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -94364,10 +91384,10 @@ }, /area/medical/surgery2) "dRz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94391,8 +91411,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -94464,8 +91483,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/morgue{ name = "Chapel Morgue"; @@ -94490,12 +91508,12 @@ /turf/simulated/wall, /area/chapel/main) "dRP" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/centcom{ name = "Chapel Office"; opacity = 1; req_access_txt = "27" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94548,8 +91566,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -94561,8 +91578,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -94582,8 +91598,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -94635,6 +91650,9 @@ on = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94643,12 +91661,9 @@ /obj/machinery/alarm{ pixel_y = 24 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/chapel/office) -"dSl" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94776,8 +91791,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -94786,14 +91800,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -94802,8 +91814,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -94822,6 +91833,7 @@ dir = 1; pixel_x = -28 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94839,13 +91851,6 @@ icon_state = "grimy" }, /area/chapel/office) -"dSM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/chair/office/dark, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) "dSN" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -94856,8 +91861,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -94882,7 +91886,10 @@ /area/maintenance/apmaint) "dST" = ( /obj/effect/decal/warning_stripes/north, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSU" = ( @@ -94897,7 +91904,6 @@ }, /area/hallway/secondary/exit) "dSV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; pixel_x = -24 @@ -94916,8 +91922,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -94931,13 +91936,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) -"dSZ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dTa" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/brflowers, @@ -94950,9 +91948,6 @@ /turf/simulated/floor/grass, /area/hallway/secondary/exit) "dTe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Experimentor"; @@ -94964,6 +91959,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -94981,14 +91979,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/north, @@ -95000,7 +91996,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dTi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -95106,10 +92101,6 @@ }, /area/chapel/office) "dTr" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/light/small{ dir = 1 }, @@ -95117,22 +92108,24 @@ pixel_x = -26; pixel_y = -4 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dTs" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dTt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -95149,14 +92142,10 @@ }, /area/medical/virology) "dTv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -95169,15 +92158,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" }, /area/medical/virology) "dTw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/simulated/floor/carpet, @@ -95186,8 +92175,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -95240,8 +92228,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) @@ -95283,34 +92270,16 @@ }, /area/hallway/secondary/exit) "dTJ" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /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" @@ -95406,10 +92375,6 @@ /turf/simulated/floor/carpet, /area/chapel/office) "dUg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, @@ -95425,8 +92390,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southwest, @@ -95437,7 +92401,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dUk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -95457,8 +92420,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -95579,14 +92541,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d2 = 8; @@ -95765,22 +92725,6 @@ /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dUU" = ( -/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 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dUY" = ( /obj/machinery/light, /obj/machinery/alarm{ @@ -95821,27 +92765,11 @@ temperature = 80 }, /area/toxins/server) -"dVe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dVj" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -95865,8 +92793,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southeast, @@ -95879,8 +92806,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -95892,8 +92818,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -95913,11 +92838,6 @@ icon_state = "dark" }, /area/medical/cmo) -"dVw" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) "dVx" = ( /obj/structure/table/wood, /obj/item/ashtray/plastic, @@ -95940,8 +92860,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -96006,8 +92925,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -96019,8 +92937,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -96039,14 +92956,14 @@ /turf/simulated/floor/plating, /area/engine/engineering) "dWj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Research Division"; req_access_txt = "47" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -96060,8 +92977,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -96072,8 +92988,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -96094,8 +93009,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -96104,8 +93018,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ name = "Toxin Mixing Lab Maintenance"; @@ -96114,12 +93027,12 @@ /turf/simulated/floor/plasteel, /area/toxins/mixing) "dWp" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -96128,8 +93041,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -96161,8 +93073,6 @@ }, /area/toxins/xenobiology) "dWs" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/structure/window/reinforced{ dir = 4 }, @@ -96171,6 +93081,8 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -96229,8 +93141,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -96243,8 +93154,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -96316,6 +93226,11 @@ initialize_directions = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -96325,17 +93240,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/aft) "dWM" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/vending/coffee, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dWN" = ( @@ -96345,22 +93259,12 @@ icon_state = "dark" }, /area/medical/cmo) -"dWO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "dWP" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -96399,8 +93303,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -96452,29 +93355,28 @@ /turf/simulated/floor/plating/airless, /area/medical/virology) "dWY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, /turf/simulated/floor/plating/airless, /area/medical/virology) "dWZ" = ( +/obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating/airless, /area/medical/virology) "dXa" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -96513,11 +93415,11 @@ /turf/simulated/floor/plating/airless, /area/medical/virology) "dXe" = ( +/obj/effect/decal/warning_stripes/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/structure/disposaloutlet, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating/airless, /area/medical/virology) "dXf" = ( @@ -96549,8 +93451,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -96567,9 +93468,10 @@ }, /area/medical/virology) "dXj" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Public Access" + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dXk" = ( @@ -96595,7 +93497,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dXm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ name = "Holding Area"; req_access_txt = "63" @@ -96615,8 +93516,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/structure/grille{ @@ -96705,13 +93605,13 @@ }, /area/medical/research) "dXw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -96817,8 +93717,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/camera{ c_tag = "Port Aft Solars" @@ -96996,15 +93895,10 @@ }, /area/medical/genetics) "dYi" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -97032,19 +93926,7 @@ icon_state = "whitepurplecorner" }, /area/medical/genetics) -"dYk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) "dYl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -97094,9 +93976,7 @@ /area/maintenance/gambling_den) "dYu" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dYw" = ( /obj/effect/decal/warning_stripes/northwest, @@ -97110,9 +93990,7 @@ /area/medical/research) "dYy" = ( /obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dYz" = ( /obj/structure/chair/stool/bar, @@ -97162,14 +94040,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -97246,14 +94122,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -97262,14 +94136,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 4; @@ -97291,8 +94163,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -97311,8 +94182,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -97380,6 +94250,16 @@ icon_state = "dark" }, /area/crew_quarters/chief) +"dZb" = ( +/obj/machinery/camera{ + c_tag = "Research Hallway"; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/medical/research) "dZi" = ( /obj/docking_port/stationary{ dir = 4; @@ -97483,8 +94363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -97552,6 +94431,16 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"esK" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/toxins/mixing) +"euc" = ( +/turf/simulated/wall/r_wall, +/area/hallway/primary/central/south) "eud" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -97581,9 +94470,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -97602,8 +94488,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -97654,9 +94539,9 @@ /area/security/brig) "eNm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Corporate Lounge"; - req_one_access_txt = "19" +/obj/machinery/door/airlock/public/glass{ + id_tag = "pub_room"; + name = "Public Meeting Room" }, /turf/simulated/floor/carpet, /area/assembly/showroom) @@ -97664,14 +94549,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -97684,6 +94567,14 @@ icon_state = "barber" }, /area/security/permabrig) +"eOL" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "ePS" = ( /obj/structure/lattice, /turf/simulated/wall/r_wall, @@ -97692,8 +94583,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/biogenerator, /turf/simulated/floor/plasteel, @@ -97702,17 +94592,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "1-2" }, +/turf/simulated/floor/wood, /area/crew_quarters/theatre) "eSe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/medical{ name = "Operating Theatre Storage"; req_access_txt = "45" @@ -97723,12 +94607,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/medical/surgery2) "eSX" = ( /obj/item/twohanded/required/kirbyplants, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -97738,14 +94629,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -97759,14 +94648,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -97822,9 +94709,24 @@ /obj/item/seeds/chili, /turf/simulated/floor/plasteel, /area/security/permabrig) +"ffm" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/maintenance/starboard) "fhF" = ( /turf/space, /area/shuttle/gamma/station) +"fjv" = ( +/mob/living/simple_animal/pet/dog/pug, +/obj/effect/landmark{ + name = "revenantspawn" + }, +/turf/simulated/floor/engine, +/area/toxins/explab) "fjJ" = ( /obj/machinery/camera{ c_tag = "Security Armory"; @@ -97871,6 +94773,12 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"fqy" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "frp" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/lavendergrass, @@ -97889,8 +94797,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -97922,6 +94829,14 @@ icon_state = "dark" }, /area/tcommsat/chamber) +"fBm" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/dropper/precision, +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/dropper, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "fDE" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -97939,8 +94854,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -98018,6 +94932,13 @@ icon_state = "grimy" }, /area/security/detectives_office) +"fMg" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "fPC" = ( /obj/structure/table/reinforced, /obj/item/flash, @@ -98055,16 +94976,16 @@ /turf/simulated/floor/plating, /area/security/brig) "fVZ" = ( -/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 = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -98083,7 +95004,7 @@ /turf/simulated/floor/plating, /area/security/prisonershuttle) "ggp" = ( -/obj/machinery/vending/coffee, +/obj/machinery/vending/coffee/free, /obj/structure/sign/electricshock{ pixel_y = 32 }, @@ -98103,7 +95024,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -98121,12 +95045,18 @@ icon_state = "neutral" }, /area/maintenance/starboard) +"gqM" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/medical/research) "gwn" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/rack, /obj/item/gun/energy/gun{ @@ -98152,9 +95082,6 @@ }, /area/security/processing) "gxd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -98189,13 +95116,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Corporate Lounge"; - req_one_access_txt = "19" +/obj/machinery/door/airlock/public/glass{ + id_tag = "pub_room"; + name = "Public Meeting Room" }, /turf/simulated/floor/carpet, /area/assembly/showroom) @@ -98225,15 +95151,14 @@ /turf/simulated/floor/plating, /area/hallway/secondary/exit) "gGu" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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/plating, /area/maintenance/starboard2) "gGJ" = ( @@ -98304,8 +95229,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -98318,6 +95242,23 @@ icon_state = "grimy" }, /area/security/detectives_office) +"gTA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engine/engineering) "gTW" = ( /turf/simulated/floor/plasteel, /area/security/securearmoury) @@ -98393,8 +95334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -98402,8 +95342,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -98412,12 +95351,25 @@ icon_state = "redcorner" }, /area/security/brig) +"hgq" = ( +/obj/machinery/atmospherics/unary/passive_vent{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "hjo" = ( /obj/structure/closet/crate, /obj/effect/landmark/costume/random, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) +"hly" = ( +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "dark" + }, +/area/crew_quarters/bar) "hmC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98449,7 +95401,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/maintenance/starboard) "hzb" = ( /obj/machinery/light{ @@ -98485,12 +95439,16 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "HoS Junction"; + sortType = 7 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -98556,9 +95514,6 @@ /turf/simulated/wall, /area/magistrateoffice) "hTW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Medbay Surgery East Storage"; dir = 1 @@ -98567,16 +95522,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/medical/surgery1) -"hZF" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/hallway/primary/starboard) "ibc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98606,8 +95558,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/securearmoury) @@ -98619,15 +95570,15 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "ifj" = ( -/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 = "showroomfloor" }, @@ -98639,6 +95590,14 @@ /obj/structure/piano, /turf/simulated/floor/plating, /area/crew_quarters/theatre) +"iiY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/atmos) "ipD" = ( /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plating, @@ -98647,12 +95606,15 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/vending/sustenance, /turf/simulated/floor/plasteel, /area/security/permabrig) +"iuU" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep) "iwQ" = ( /obj/machinery/light_switch{ pixel_y = 26 @@ -98674,8 +95636,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) @@ -98691,9 +95652,6 @@ }, /area/maintenance/starboard) "iDa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door_control{ id = "magistrate"; name = "Privacy Shutters Control"; @@ -98701,10 +95659,20 @@ }, /obj/structure/table/wood, /obj/machinery/computer/secure_data/laptop, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/magistrateoffice) +"iDz" = ( +/obj/machinery/door/poddoor{ + id_tag = "toxmix1"; + name = "Space Vent" + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "iFx" = ( /obj/structure/sink{ dir = 8; @@ -98725,6 +95693,32 @@ icon_state = "whiteblue" }, /area/medical/surgery2) +"iIw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/aft) +"iIY" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/storage/briefcase, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/turf/simulated/floor/wood, +/area/medical/psych) "iKj" = ( /obj/machinery/light_switch{ pixel_x = -23; @@ -98744,14 +95738,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; @@ -98768,8 +95760,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, @@ -98783,8 +95774,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -98801,6 +95791,12 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"iWE" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) "iXX" = ( /obj/structure/cable{ d1 = 1; @@ -98814,7 +95810,7 @@ /obj/machinery/door/window/brigdoor{ dir = 2; name = "Warden's Desk"; - req_access_txt = "3" + req_access_txt = "63" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -98837,6 +95833,18 @@ icon_state = "cult" }, /area/magistrateoffice) +"jbq" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/wrench, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; + name = "Chemistry Cleaner" + }, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "jgO" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "Brig"; @@ -98851,8 +95859,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -98860,6 +95867,9 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98871,9 +95881,9 @@ }, /area/engine/break_room) "jkU" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -98888,6 +95898,26 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"jsi" = ( +/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 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/maintenance/starboard) "jsV" = ( /obj/structure/cable{ d1 = 4; @@ -98928,18 +95958,29 @@ }, /area/security/warden) "jCU" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, /obj/structure/filingcabinet, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/magistrateoffice) +"jFV" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engine/engineering) "jHa" = ( /obj/machinery/atm{ pixel_x = -32 @@ -98949,6 +95990,12 @@ icon_state = "neutralcorner" }, /area/crew_quarters/fitness) +"jHd" = ( +/obj/machinery/door/airlock/glass{ + name = "Cabin" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep) "jIs" = ( /turf/simulated/wall/r_wall, /area/security/evidence) @@ -98958,14 +96005,41 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) +"jKp" = ( +/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 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) +"jLB" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/toxins/misc_lab) "jQY" = ( /turf/simulated/wall/r_wall, /area/security/seceqstorage) @@ -98980,18 +96054,15 @@ }, /area/hallway/primary/central) "jUH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -99001,6 +96072,12 @@ icon_state = "neutralfull" }, /area/security/brig) +"jVL" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "jYK" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -99017,15 +96094,14 @@ /turf/simulated/floor/plating, /area/security/seceqstorage) "khY" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + 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, /area/maintenance/starboard2) "kii" = ( @@ -99056,6 +96132,13 @@ }, /turf/simulated/floor/plasteel, /area/security/permabrig) +"kjL" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/medical/medbay) "kkM" = ( /obj/vehicle/secway, /obj/item/key/security, @@ -99064,6 +96147,12 @@ icon_state = "vault" }, /area/security/securearmoury) +"klh" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) "klk" = ( /obj/machinery/firealarm{ dir = 1; @@ -99083,8 +96172,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -99123,29 +96211,18 @@ }, /area/security/detectives_office) "kyq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) -"kzg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/warden) "kCi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -99165,7 +96242,7 @@ /obj/machinery/door/window/brigdoor{ dir = 2; name = "Secure Armory"; - req_access_txt = "3" + req_access_txt = "63" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -99186,6 +96263,13 @@ /obj/item/clipboard, /turf/simulated/floor/plating, /area/security/permabrig) +"kRz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "kSX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99205,9 +96289,9 @@ }, /area/security/securearmoury) "kVM" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -99216,8 +96300,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, @@ -99241,6 +96324,16 @@ icon_state = "solarpanel" }, /area/maintenance/auxsolarstarboard) +"lah" = ( +/obj/machinery/dye_generator, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "ljZ" = ( /obj/machinery/door/poddoor{ density = 0; @@ -99272,38 +96365,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/seceqstorage) -"loP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/brig) "lso" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -99330,14 +96397,10 @@ }, /area/crew_quarters/courtroom) "ltY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99346,6 +96409,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "luc" = ( @@ -99400,8 +96466,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -99409,7 +96474,9 @@ }, /area/security/securearmoury) "lEt" = ( -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Court gallery" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -99450,8 +96517,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/closet/secure_closet/security, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -99478,8 +96544,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -99491,8 +96556,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -99535,6 +96599,14 @@ "mhu" = ( /turf/simulated/wall/r_wall, /area/security/permasolitary) +"mhT" = ( +/obj/structure/reagent_dispensers/fueltank/chem{ + pixel_x = -32; + pixel_y = null + }, +/obj/machinery/chem_heater, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "miL" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -99566,12 +96638,21 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"mlR" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 4; + frequency = 1443; + icon_state = "on"; + id = "air_in"; + on = 1 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "mmw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/chair/stool, /obj/effect/landmark/start{ @@ -99580,8 +96661,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/alarm{ pixel_y = 24 @@ -99595,8 +96675,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -99607,6 +96686,16 @@ icon_state = "redcorner" }, /area/security/permabrig) +"mnG" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/medical/research) "moa" = ( /obj/structure/window/reinforced{ dir = 8 @@ -99644,18 +96733,20 @@ icon_state = "vault" }, /area/security/securearmoury) +"mtx" = ( +/obj/item/radio/beacon, +/turf/simulated/floor/plasteel/airless, +/area/toxins/test_area) "mtL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permabrig) "mtR" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -99685,8 +96776,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -99698,8 +96788,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -99708,10 +96797,10 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + dir = 8; + icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "mDm" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -99737,39 +96826,35 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) -"mHf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/brig) "mHP" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Security Junction"; - sortType = 13 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" }, /area/hallway/primary/starboard) +"mIp" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/machinery/sparker{ + id = "toxinsigniter"; + pixel_x = -20 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "mKe" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -99781,6 +96866,32 @@ icon_state = "neutralfull" }, /area/security/brig) +"mLW" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/warning_stripes/east, +/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) +"mMt" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/engine/engineering) "mOF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99806,8 +96917,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/flasher_button{ id = "Cell 3"; @@ -99824,6 +96934,13 @@ icon_state = "redcorner" }, /area/security/permabrig) +"mTO" = ( +/obj/machinery/air_sensor{ + frequency = 1222; + id_tag = "burn_sensor" + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "mWj" = ( /obj/machinery/door/airlock/external{ frequency = 1379; @@ -99841,6 +96958,27 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"mZY" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/genetics_cloning) +"nbz" = ( +/obj/machinery/camera{ + c_tag = "Research Break Room"; + dir = 4; + network = list("Research","SS13") + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/toxins/misc_lab) "nbE" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/ambrosia, @@ -99853,8 +96991,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -99894,8 +97031,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -99917,12 +97053,6 @@ icon_state = "barber" }, /area/security/permabrig) -"nkh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/security/processing) "nli" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/cleanliness{ @@ -99934,12 +97064,9 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/computer/security{ - network = list("SS13","Mining Outpost") + icon_state = "4-8" }, +/obj/machinery/computer/security, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -99955,6 +97082,12 @@ /obj/item/seeds/orange, /turf/simulated/floor/plasteel, /area/security/permabrig) +"nte" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "nvc" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -99976,8 +97109,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair{ dir = 1 @@ -100003,6 +97135,10 @@ icon_state = "darkblue" }, /area/ai_monitored/storage/eva) +"nFX" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/civilian/barber) "nGL" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -100059,8 +97195,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -100069,7 +97204,6 @@ }, /area/security/permasolitary) "nQq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atm{ pixel_x = 32 }, @@ -100092,8 +97226,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100171,8 +97304,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/seceqstorage) @@ -100188,8 +97320,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -100210,8 +97341,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -100222,6 +97352,15 @@ "oEG" = ( /turf/simulated/floor/plating, /area/space/nearstation) +"oHv" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "oHY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -100236,6 +97375,9 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) +"oNd" = ( +/turf/simulated/wall, +/area/civilian/barber) "oSH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -100245,8 +97387,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -100255,8 +97396,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -100273,8 +97413,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -100282,8 +97421,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -100305,9 +97443,6 @@ }, /area/hallway/primary/central) "pgF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigWest"; @@ -100328,6 +97463,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "phv" = ( @@ -100340,8 +97478,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/chair/stool, /obj/effect/landmark/start{ @@ -100352,6 +97489,19 @@ icon_state = "red" }, /area/security/seceqstorage) +"pjY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "ppj" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -100378,12 +97528,20 @@ /obj/item/clothing/head/fedora, /turf/simulated/floor/plating, /area/security/detectives_office) +"pDD" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) "pGr" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -100417,12 +97575,17 @@ icon_state = "grimy" }, /area/crew_quarters/theatre) +"pRe" = ( +/obj/structure/table/wood, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "pRg" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door_control{ id = "Secure Gate"; @@ -100449,6 +97612,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -100540,8 +97707,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -100584,7 +97750,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "qHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; @@ -100618,6 +97784,14 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) +"qOO" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "qRT" = ( /obj/structure/cable{ d1 = 4; @@ -100650,6 +97824,16 @@ icon_state = "red" }, /area/security/warden) +"qWp" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 4 + }, +/obj/machinery/meter{ + layer = 3.31 + }, +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, +/area/toxins/mixing) "qXF" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -100668,8 +97852,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -100686,8 +97869,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -100703,10 +97885,9 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/obj/machinery/vending/secdrobe, +/obj/structure/closet/wardrobe/red, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -100745,6 +97926,7 @@ dir = 8; network = list("SS13","Security") }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -100761,33 +97943,28 @@ icon_state = "darkblue" }, /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" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "rkB" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/warden) +"rkJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/crew_quarters/sleep) "rmq" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -100809,6 +97986,17 @@ icon_state = "darkblue" }, /area/medical/surgery2) +"rtH" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/toxins/misc_lab) "rvx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -100818,6 +98006,12 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) +"rCe" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 10 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "rCw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; @@ -100827,6 +98021,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) +"rCJ" = ( +/obj/structure/chair/comfy/purp{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/toxins/misc_lab) "rDp" = ( /obj/structure/cable{ d2 = 4; @@ -100847,6 +98053,32 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"rHU" = ( +/obj/structure/chair, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) +"rIy" = ( +/obj/machinery/door/airlock/research{ + name = "Research Break Room" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) +"rIK" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/port) "rNi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100898,8 +98130,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -100909,8 +98140,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -100929,8 +98159,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -100942,24 +98171,31 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"rUS" = ( +/obj/machinery/door_control{ + id = "pub_room"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/simulated/floor/carpet, +/area/assembly/showroom) "rZK" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -100970,6 +98206,11 @@ }, /turf/simulated/floor/plasteel, /area/security/permabrig) +"sak" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/turf/simulated/floor/wood, +/area/medical/psych) "scA" = ( /obj/machinery/firealarm{ dir = 8; @@ -101012,13 +98253,20 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"soN" = ( +"sjV" = ( /obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/research) +"soN" = ( /obj/machinery/computer/operating, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -101036,6 +98284,17 @@ icon_state = "red" }, /area/security/seceqstorage) +"spS" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/atmos) "ssp" = ( /obj/machinery/door/airlock/security/glass{ name = "Solitary Confinement"; @@ -101050,8 +98309,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -101072,6 +98330,17 @@ /obj/item/seeds/glowshroom, /turf/simulated/floor/plasteel, /area/security/permabrig) +"sxS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/research{ + name = "Research Chemistry"; + req_access_txt = "7" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "sAW" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/plasteel{ @@ -101085,25 +98354,25 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/processing) "sEN" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; @@ -101115,6 +98384,12 @@ icon_state = "neutralfull" }, /area/security/brig) +"sMj" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/simulated/floor/engine, +/area/toxins/mixing) "sPS" = ( /obj/structure/cable, /obj/machinery/power/solar_control{ @@ -101163,12 +98438,19 @@ icon_state = "redcorner" }, /area/security/brig) +"sYw" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/medical/medbay) "sYQ" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -101183,10 +98465,8 @@ }, /area/maintenance/starboard) "tah" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -101199,8 +98479,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -101222,9 +98501,7 @@ /area/security/permabrig) "tgs" = ( /obj/structure/chair/office/dark, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/detectives_office) "tgE" = ( /turf/simulated/wall/r_wall, @@ -101233,8 +98510,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -101247,10 +98523,20 @@ icon_state = "redcorner" }, /area/security/permabrig) -"tks" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" +"tke" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 5; + pixel_y = 5 }, +/obj/item/storage/box/gloves, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/medical/research) +"tks" = ( +/turf/simulated/floor/wood, /area/security/detectives_office) "tmo" = ( /obj/structure/closet/secure_closet/security, @@ -101271,14 +98557,12 @@ /turf/simulated/floor/plasteel, /area/security/permasolitary) "tsN" = ( -/obj/structure/chair/comfy/purp{ - dir = 1 - }, +/obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" }, -/area/medical/research) +/area/toxins/misc_lab) "tvq" = ( /obj/structure/table, /obj/item/toy/figure/crew/syndie, @@ -101312,8 +98596,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -101323,14 +98606,16 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/door/airlock/security/glass{ name = "Warden's Office"; req_access_txt = "3" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/warden) "tHf" = ( @@ -101341,12 +98626,10 @@ /turf/simulated/floor/plating, /area/crew_quarters/theatre) "tJH" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -101365,12 +98648,38 @@ icon_state = "neutralfull" }, /area/security/brig) +"tLE" = ( +/obj/structure/chair/comfy/purp{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) +"tMu" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/medical/research) +"tNq" = ( +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 28 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/maintenance/starboard) "tNO" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/machinery/firealarm{ pixel_y = 26 @@ -101394,8 +98703,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -101403,8 +98711,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -101416,12 +98723,14 @@ }, /area/security/brig) "tRM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -101458,8 +98767,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -101469,6 +98777,25 @@ }, /turf/simulated/floor/plating, /area/security/range) +"tXj" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/chair/barber{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "uil" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 @@ -101484,8 +98811,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -101514,8 +98840,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -101531,9 +98856,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -101639,14 +98961,25 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/securearmoury) +"uKI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/security/medbay) "uQK" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -101654,17 +98987,6 @@ icon_state = "whiteblue" }, /area/medical/surgery2) -"uSJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/main) "uUu" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -101711,8 +99033,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -101755,6 +99076,19 @@ icon_state = "red" }, /area/security/seceqstorage) +"veH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/atmos) "vhT" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -101765,8 +99099,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching interrogations."; @@ -101774,6 +99107,9 @@ network = list("Interrogation"); pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -101782,24 +99118,36 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/security/permabrig) +"viE" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/toxins/misc_lab) "vmw" = ( /obj/structure/fans/tiny, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; @@ -101813,8 +99161,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/alarm{ @@ -101832,6 +99179,13 @@ /obj/item/clothing/under/color/orange/prison, /turf/simulated/floor/plating, /area/maintenance/starboard) +"vrp" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "vrB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -101842,6 +99196,13 @@ icon_state = "showroomfloor" }, /area/medical/surgery1) +"vrF" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/disaster_counter/scichem{ + pixel_y = 32 + }, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "vsy" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/power/apc{ @@ -101899,12 +99260,22 @@ icon_state = "dark" }, /area/tcommsat/chamber) +"vDY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engine/engineering) "vEh" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 9; @@ -101937,12 +99308,15 @@ icon_state = "wood-broken" }, /area/security/detectives_office) +"vFq" = ( +/obj/machinery/chem_master, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "vGw" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -101954,6 +99328,14 @@ icon_state = "red" }, /area/security/warden) +"vGz" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "vJK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, @@ -101968,6 +99350,13 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"vLu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "vLN" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -102004,9 +99393,20 @@ icon_state = "red" }, /area/hallway/secondary/exit) +"vVf" = ( +/obj/machinery/chem_dispenser, +/obj/item/reagent_containers/glass/beaker/large, +/turf/simulated/floor/engine, +/area/toxins/misc_lab) "vXX" = ( /turf/space, /area/space/nearstation) +"vYC" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple" + }, +/area/toxins/misc_lab) "wdH" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -102062,6 +99462,18 @@ icon_state = "red" }, /area/security/processing) +"wtE" = ( +/obj/structure/cable{ + 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/plasteel{ + icon_state = "barber" + }, +/area/civilian/barber) "wtK" = ( /obj/structure/lattice, /obj/structure/sign/electricshock{ @@ -102146,20 +99558,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -102172,8 +99581,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -102211,14 +99619,25 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, /area/security/detectives_office) +"xme" = ( +/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{ + icon_state = "whitepurple" + }, +/area/medical/research) "xom" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/navbeacon{ @@ -102233,6 +99652,12 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) +"xpu" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "xqH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -102254,8 +99679,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark/start{ name = "Warden" @@ -102295,15 +99719,15 @@ }, /area/security/warden) "xHj" = ( -/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 = "showroomfloor" }, @@ -102343,8 +99767,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -102354,14 +99777,10 @@ }, /area/hallway/primary/starboard) "xQW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -102372,6 +99791,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "xUI" = ( @@ -102388,8 +99810,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -102406,16 +99827,29 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/interrogation) +"ydp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutral" + }, +/area/maintenance/port) "yds" = ( /obj/structure/cable{ d2 = 4; @@ -102437,8 +99871,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/security/brig) @@ -102471,7 +99904,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "ygH" = ( /turf/simulated/wall/r_wall, /area/security/permabrig) @@ -102482,8 +99915,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, @@ -116551,7 +113983,7 @@ dyo dzv dAH dAH -dAH +mtx dAH dAH dFf @@ -119315,7 +116747,7 @@ abj abj abj abj -bYm +bUJ abj coi abj @@ -119572,7 +117004,7 @@ aaa aaa abj aaa -bYm +bUJ aaa csr aaa @@ -119829,7 +117261,7 @@ aaa aaa abj aaa -bYm +bUJ aaa csr aaa @@ -120086,7 +117518,7 @@ abj abj abj abj -bYm +bUJ abj coi abj @@ -120343,7 +117775,7 @@ aaa aaZ abj aaa -bYm +bUJ aaa csr aaa @@ -120600,7 +118032,7 @@ abj abi abj abj -bYm +bUJ aaa csr aaa @@ -120857,7 +118289,7 @@ aaa abj aaa aaa -bYm +bUJ abj coi abj @@ -121114,7 +118546,7 @@ abi abi abi abj -bYm +bUJ aaa csr aaa @@ -121371,7 +118803,7 @@ abj abj abi aaa -bYm +bUJ aaa csr aaa @@ -121628,7 +119060,7 @@ bwN abj abj abj -bYm +bUJ abj coi abj @@ -121885,7 +119317,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122142,7 +119574,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122399,7 +119831,7 @@ bwN abj abj abj -bYm +bUJ abj coi abj @@ -122656,7 +120088,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122913,7 +120345,7 @@ bwN abj abj aaa -bYm +bUJ aaa csr aaa @@ -123169,7 +120601,7 @@ bGs bwN abj bVs -bYa +bXG bYJ abj csr @@ -127507,9 +124939,9 @@ aLn aML aOg aPH -aQZ -aSD -aUc +spS +iiY +veH aVI aXn aYD @@ -128829,16 +126261,16 @@ bWK bWK bYo bXZ -bZx +bhL cbp -cgN -bos -cgN -cfb -cgN -cfb -cgN -cfb +mMt +gTA +mMt +jFV +mMt +jFV +mMt +vDY cpt cfb cgN @@ -131958,7 +129390,7 @@ djf djn ddi dng -dng +fjv dng ddi cYc @@ -132472,7 +129904,7 @@ dhL dkx dkE dlP -dnd +dng cPf ddi cQY @@ -132728,9 +130160,9 @@ dgf dhM djs dkF -dlP -dne -cPf +dng +dng +dng ddi cQY cXU @@ -132985,10 +130417,10 @@ dge dhR djt dkH -cKs -dnf -dER -ddi +dkI +dkI +dkI +dkI cYc dsr cHA @@ -133241,11 +130673,11 @@ dgc dgf dhT dju -dkH +dkI cKu -dng -dng -ddi +mIp +sMj +dkI cQY dhG cHA @@ -133498,14 +130930,14 @@ dgc dgc dhU djw -dkH -dng -dng -dng -ddi -cYe -drn -cLA +dkI +jVL +mTO +jVL +dkI +vGz +cAS +ydp drn dvV dxh @@ -133755,14 +131187,14 @@ dgc dgg dhQ djx -dkF -dng +dkI +rCe dnh doD -ddi -drp -dst -cly +dkI +dmq +dmq +rIK dst dvW dWn @@ -134012,13 +131444,13 @@ dgj dgk dhV djy -ddi -dng -dng -dng -ddi -dsq -cNh +dkI +mlR +nte +hgq +iDz +vXX +dmq dtP cNh dvX @@ -134270,9 +131702,9 @@ dds dTe djv dkI -dkI -dkI -dkI +esK +qWp +esK dkI dkI dkI @@ -134519,9 +131951,9 @@ cTM cVm cWT dto -cND +tke dbO -cPn +gqM cZx dgl dhW @@ -134785,7 +132217,7 @@ dhY dhD dkK dlS -cMD +dve dve dwe dCN @@ -135282,7 +132714,7 @@ cIO bQx cLU cNw -cOZ +cQP cVf cVf cSc @@ -135290,7 +132722,7 @@ cVf cWK cWV dvN -dau +cND dbP cPn cIW @@ -135793,9 +133225,9 @@ cDW cGr dmq dmq -cKr -cKr -cKr +dvf +dvf +dvf cPb cQJ cSh @@ -136050,17 +133482,17 @@ dhG cGs cHw cIQ -cZt +cYA cLV -cKr -cKr -cKr -cKr -cKr -cKr -cKr -cKr -cKr +dvf +dvf +dvf +dvf +dvf +dvf +dvf +dvf +dvf dau dbP cPn @@ -136307,20 +133739,20 @@ drn cGt cHx cXU -cZt -dau +cYA +vYC mzQ -dau -dau -dau +viE +nbz +cYA cTI +mhT +vVf +vFq +cYA dau -dau -dau -cYs -dau -dbR -ddw +dbP +cPn dBD dgq did @@ -136568,14 +134000,14 @@ cLB cLX cNx cPg -daA -daA +cTJ +cYA cMl -daA -daA -daA -cYt -daA +dni +vrp +dni +cYz +dau dbS cPn dfe @@ -136821,20 +134253,20 @@ cJO cGv drn cIS -cZt -cMn -cKF +cYA +rCJ +tLE +cPh +cVj +cYz +cVj +cVj cPh -cKF -cVJ -cNy -cKF -cKF cYo -cYu +cYA daB -dbV -cPn +mLW +tMu dff dff czd @@ -137078,20 +134510,20 @@ cHA cIz cHA cHA -cZt -cZt -cZt +cYA +rtH +pRe cQw -cZt -cZt -cIW -cIW -cIW -cZt -cZt -cZu +vLu +rIy +kRz +qOO +pjY +kRz +sxS +ctm cZy -dde +cPn dff dgs die @@ -137335,19 +134767,19 @@ bst cGx cHB bvV -cZt +cYA cMa cNA -cPj -cQZ -cSj +cWN +cVj +cYz cTJ cVj cWN -cIW -cYv -cKF -dbV +cVj +cYA +dau +dbP cPn dfg dgt @@ -137592,19 +135024,19 @@ cDd cGy xqH ddm -cZt +cYA cMb -cNB +cVj cPk -cRa -muI -cMm -cMm -cWO -cIW +cTJ +cYA +vrF +fMg +dmd +fBm cYz -cKF -dbV +dau +dbP cPn dfh dhN @@ -137849,19 +135281,19 @@ cEL btE cHC ddn -cZt +cYA cMc -cPl +tsN tsN cRb -cWu +cYA cTL cVl cWP -cIW +jbq cYA -cKF -dbV +dau +dbP cPn dfi dhO @@ -138106,19 +135538,19 @@ cFp dxV ddl cIV -cZt -cIW -cIW -cIW -cRc -cZt -cZt -cZt -cZt -cZt -cZt +cYA +cYz +cYz +cYz +jLB +cYA +cYA +cYA +cYA +cYA +cYA dtS -dbV +dbP cPn dfj dhP @@ -138161,7 +135593,7 @@ dQl dQY dXI dJx -dSi +dij dSJ dTs dml @@ -138367,15 +135799,15 @@ cKw cMd cND cPn -aKA +mnG cSm cZt cTU -cVq +cMm cXb cZt -cKF -dbV +dZb +dbP cPn dfk dig @@ -138397,10 +135829,10 @@ dwi dwi cKr dCQ -dEP -dFr -dFr -dGc +cNI +cRe +cRe +cRi dJy dHE dID @@ -138618,10 +136050,10 @@ cDO csK cEL bqu -cHE -cIX +bIG +cIW cKx -cMe +cMm cMf cPo aKC @@ -138633,10 +136065,10 @@ cXc cYB daE dbW -cPn -cPn -dih -cPn +cGJ +cGJ +cIn +cIY djL dkV cPn @@ -138654,7 +136086,7 @@ dXv cRd cZt dCR -dFr +cPs dEP dOO dGc @@ -138875,13 +136307,13 @@ cEb csK cGY bqu -cHF -cIY -cKy +cHE +cIX cMe -cNE -cPr -cMm +xpu +xme +sjV +eOL cPn cKI cUZ @@ -138891,7 +136323,7 @@ cKI daF cvm ddA -cRe +daA cxD dii djM @@ -138903,15 +136335,15 @@ drN dyL dyL dyL -dkW +cMg cZH dxx -cNx +cMj dzT dbj dBh -dik -dFr +cNE +cPF dOO dFr dID @@ -138932,8 +136364,8 @@ dMm dPL dRz dRP -dSl -dSM +dTs +dSL dUg dUR dYT @@ -139133,33 +136565,33 @@ cEP cIT bqu cHG -cIY -cKy -cMg +cJa +dau +cMm cNF cPq -cMe -ddw +ckH +cPn cTC -cVc -cWH -cYk +dje +dfR +djD cZr -cKE +cKF dbX cSt dfm dgv -dij -duc +cSt +cSt dkX -duc -duc +cSt +cSt dIi dsu -duc -duc -duc +cSt +cSt +cSt dvj dgv cSt @@ -139365,11 +136797,11 @@ bQH ciB bUR chi -bYs +cbT chi -bYs +cbT cnv -bYs +cbT chh ciD ckq @@ -139389,13 +136821,13 @@ cEr cEQ cIT bqu -bIG +cHG cIW cKz -cMi +cMm cNG cPr -cMm +ckH cRd cZx cVd @@ -139585,11 +137017,11 @@ aKq aFA aFA aOF -aPZ +hly aRA aRd aRA -aPZ +hly aIZ aYZ aYZ @@ -139646,13 +137078,13 @@ cEr cER cIT bqu -bIG +cHG cIW cKA -cMi +cMm cNG cPr -cMm +ckH cSp cTQ cVr @@ -139854,7 +137286,7 @@ aZa bdN bfj bgy -bhL +bdP aZh blm bmZ @@ -139906,10 +137338,10 @@ qZt exL cIZ cKB -cMj +muI cNH cPr -cMm +ckH cWL cTR cVe @@ -139937,7 +137369,7 @@ dzW dEn dEn duZ -dEy +cMk dCV dbC dbI @@ -140106,7 +137538,7 @@ aWj aLS aUj aOG -aTp +aOG bcx bdP bdQ @@ -140160,15 +137592,15 @@ cEN csK cES bqu -bIG +cHG cIW cKC -cMk -cNI -cPs -cMe +cMm +cNG +cPr +ckH cSr -cTS +cTT cVt daJ daJ @@ -140204,8 +137636,8 @@ dfu dfu dIH dJC -dKo -dKo +cYk +cYk dLE dXJ dKo @@ -140382,7 +137814,7 @@ abj bwe bAx bCp -byW +bAB bFC bHk bJg @@ -140417,13 +137849,13 @@ cCK csK cET bqu -bIG +cHG cIW cKD cMm cNG cPr -cMm +ckH cRg cTR cVu @@ -140460,13 +137892,13 @@ dGh dGP dHN dHU -dQI -dKo -dKo -dLE -dXJ -dNa -dNa +cWb +cYk +cYk +daQ +dbR +dbV +ddw dNa dKo dKo @@ -140620,9 +138052,9 @@ aUJ aWh aUw aOG -aOG -aYZ +aTp bdR +bdP bgv bgB bhR @@ -140654,13 +138086,13 @@ bOZ cab cbW cdI -cfF +cfK chk ciF bYv aaa aaa -bHk +dER cpV cry csK @@ -140674,13 +138106,13 @@ csK csK cEU bqu -bKt -cIY -cKE -cMe +cHG +cJa +cKF +cMm cNJ cPt -cMe +ckI cSs cTT cVv @@ -140717,10 +138149,10 @@ dGl dGS dHT dII -dJD +cWH dKo dKo -dLE +dLG dXJ dNb dNN @@ -140931,7 +138363,7 @@ cCL cEe cEL bqu -bIG +cHG cJa cKF cMm @@ -140974,10 +138406,10 @@ dGl dGS dHT dIJ -dJD +cWH dKo dKo -dLE +dLG dXJ dNc dNO @@ -141172,12 +138604,12 @@ cfG chl ciH bYv -bHk -bHk -bHk +dER +dER +dER cpX crB -bHj +euc ctZ csN cxa @@ -141188,7 +138620,7 @@ cCM cEf cEL bqu -bIG +cHG cIW cKG cMm @@ -141232,10 +138664,10 @@ dGS dHQ dLD dST -dSZ -dSZ -dTK -dUU +dKo +dKo +dLG +dXJ dNb dNP dOw @@ -141445,7 +138877,7 @@ cyk gyY cEV cGz -bIG +cHG cIW cKH cMn @@ -141492,7 +138924,7 @@ dXC dKp dKp dLF -dVe +dXJ dOu dNQ dOx @@ -141679,10 +139111,10 @@ bMX bOT aaa bOZ -bOZ -bOZ -bOZ -bOZ +dne +dnf +cfK +drp bYv ciJ bYv @@ -141739,9 +139171,9 @@ dql dBH dCX dfu -dVw +dHT dcV -dGU +iIw dWL dWM dIK @@ -141749,7 +139181,7 @@ dQI dKo dKo dLG -dVe +dXJ dNb bGr dOw @@ -141935,11 +139367,11 @@ bQL bSJ bOT aaa -bYw +bOZ caf cca -cdM -cfJ +cfK +cfK chn cpT csW @@ -141981,7 +139413,7 @@ diu dnC doS dnC -dnD +dHT doY dft drL @@ -141996,9 +139428,9 @@ doY doY dDb dXj -dnD +dHT dcV -dGU +iIw dGU dHS dIH @@ -142143,30 +139575,30 @@ asB aBj azv aAG -aZe -aZe -aZe +aXX +aXX +aXX aGI -aIg +aXZ aGI -aZe -aZe +aXX +aXX aKu -aZe -aZe -aZe -aZe -aZe +aXX +aXX +aXX +aXX +aXX aTj aWm -aZe -aZe aXX aXX +bvg +bvg bgw -aXZ -aXX -aXX +byW +bvg +bvg bhP bjB bar @@ -142178,7 +139610,7 @@ btH aaa bwh bxr -byW +bAB bAy bCt bEg @@ -142192,7 +139624,7 @@ bQM bSK bOT abj -bYw +bOZ cag ccb cdN @@ -142201,15 +139633,15 @@ cho ciL cnx clT -cnx -cnx +dLT +dLT cqb crF csR cud cvF cxa -cBo +rUS czN cBq cCP @@ -142257,7 +139689,7 @@ dEZ dcj dWK dcS -dHT +cUv dXn dXn dXn @@ -142449,7 +139881,7 @@ bQL bSL bOT aaa -bYw +bOZ cah ccc cdO @@ -142475,12 +139907,12 @@ cFa cGB cHK dEm -cKL -cKL -cNP -cPz cRh -diw +cRh +cNP +cRh +cRh +cmn cTW cYC cXd @@ -142490,16 +139922,16 @@ daO cYC cYC dgw -diw -diw +cmn +cmn dle cJY dmh -dnE +dpa dpa dsI drM -dnE +dpa nQq cTW dwu @@ -142509,12 +139941,12 @@ dQr dBj dBQ dDd -dXj +cRc dnD dGo dGo -dcV -dnD +cTS +cVc dXm dSV dTi @@ -142736,7 +140168,7 @@ cJk cJg cNQ cPA -cRi +cJg cJk cTX cVD @@ -142987,12 +140419,12 @@ cBo eNm cFa bqu -cHN +cHK cJg cKM cMo cNR -cPL +cSA cRj cSx cTX @@ -143000,7 +140432,7 @@ cVE cXf cYD cXe -daQ +cVD dcl cVD dgD @@ -143228,12 +140660,12 @@ cfN chr ciP bYx -bHk -bHk -bHk +dER +dER +dER cqe crJ -bHj +euc cuh csN cxa @@ -143244,13 +140676,13 @@ cCS cEf cFa bqu -cHN +cHK cJg cKN cMq cNS -cRk -cRk +cMq +cMq cSy cTY cVF @@ -143274,7 +140706,7 @@ dsO duk cYN dww -dww +cMi dwz dAd dwB @@ -143501,7 +140933,7 @@ cCT cEe cFa bqu -cHN +cHK cJh cKO dea @@ -143744,7 +141176,7 @@ ciR bYx aaa aaa -bHk +dER cqg crP csV @@ -143758,7 +141190,7 @@ csV csV cEY bqu -cHN +cHK cJh cKO dea @@ -143771,7 +141203,7 @@ cVH cXh cYF dlW -cXg +ctb cXg ddN dgD @@ -143782,7 +141214,7 @@ dfv dfv dYc dYi -dYk +drX drX dsQ duk @@ -144015,12 +141447,12 @@ cCV csV cFa bqu -cHN +cHK cJg cKP dea cbr -cPF +dea cha cSB cUb @@ -144272,13 +141704,13 @@ cCW csV cEZ bqu -cHN +cHK cJg cKQ dea -cNS +bYQ cMq -cUn +ckJ cSA cTZ cZF @@ -144495,7 +141927,7 @@ bwf aos bCy bEl -bFP +bCL bHz bJl bLa @@ -144535,7 +141967,7 @@ cKR cMr cbr cPH -cUn +ckJ cSD cTY cVK @@ -144786,13 +142218,13 @@ dte csV cFa bqu -cHN +cHK cJg cKS dea -cNS +bYQ cMq -cUn +ckJ cSE cTX cXe @@ -145008,7 +142440,7 @@ abj bwf bAG bCl -byU +aZe bFQ bWX bJn @@ -145043,13 +142475,13 @@ cDa csV cFa bqu -cHN +cHK cJg cKT dea cbr dea -cUn +ckJ cRm cJg cVM @@ -145265,7 +142697,7 @@ aaa bwf bAt bCl -byU +aZe bFx bWX bJo @@ -145306,7 +142738,7 @@ cKU cMs cNV cPI -cUn +ckJ cSF cUc cVN @@ -145522,7 +142954,7 @@ aaa bwf aot bCA -bEk +bkf asz bHx bJp @@ -145563,7 +142995,7 @@ cKV dea cbH ceQ -cUn +ckS cSF cUd cUn @@ -145575,14 +143007,14 @@ dco cSA dfz dgM -diC +mZY dkb dlq dnM dpm dpm dqA -drX +cKE dsX duk dvz @@ -145779,7 +143211,7 @@ aaa bwf bAs bCB -bAs +boT bAs bHx bJq @@ -145839,7 +143271,7 @@ dta dnQ dpn dqB -drY +dpn dsY duk duk @@ -146036,7 +143468,7 @@ btH bwf bAr bCl -byU +aZe bFR bHx bJr @@ -146550,7 +143982,7 @@ bwm bza bEo bCC -bEo +bqv bEo bHA bwm @@ -146568,7 +144000,7 @@ bwm bwm bwm ciV -ckH +bwm bwm bwm coE @@ -146807,7 +144239,7 @@ btK bva bva bCD -bva +bsg bFM bHB bva @@ -146825,7 +144257,7 @@ bva bva bva bva -ckI +bva bva bva bSi @@ -147064,7 +144496,7 @@ bxz bzb bEq bCE -bEq +bub bHm bHC bEq @@ -147082,15 +144514,15 @@ pfp cfS cnw cnC -ckJ +bSF cme bSF jUC cqp crT -ctb +bEq cuo -rjr +bSF bSF cyA bSF @@ -147113,7 +144545,7 @@ cKV cKV cKV cKV -don +ctd cSF dil cSF @@ -147125,7 +144557,7 @@ cSF dps cSF dsc -dtd +cRm duk dvE dwF @@ -147354,10 +144786,10 @@ cxn cxn cxn cxn -bng +rHU cGF -bng -bng +iWE +pDD bng cYP cYP @@ -147602,9 +145034,9 @@ cvu coI cqq bYH -ctd +cEL cuu -bqv +bIX cxn cyB cAc @@ -147615,8 +145047,8 @@ cFd hos cmt bMD -cKZ -cYP +cLa +iIY cOa cPQ cRp @@ -147637,7 +145069,7 @@ dFE dmt dnU dpu -dqH +cKy dsd dul dur @@ -147859,9 +145291,9 @@ cax cax cax bYK -ctd +cEL cuu -bqv +bIX cxn cyC cAd @@ -147869,16 +145301,16 @@ cBF cAc cxn bDD -buF -boG -boG +jsi +cmt +ffm cLa -cYP +sak cOb cPQ cRq cSJ -cUh +cVQ cVQ cYP cYR @@ -148118,7 +145550,7 @@ chC lEt ctf cus -bsg +bhX cxn cyD bBk @@ -148126,11 +145558,11 @@ cAc cyD cxn bEH -cGJ -boG -boG +jKp +tNq +klh cLb -cYP +cPQ cOc cPR cRr @@ -148373,9 +145805,9 @@ cay cax cqr bYK -ctj +cFa cuu -bqv +bIX cxn cxn cAe @@ -148384,8 +145816,8 @@ cxn cxn bng cGI -cJp -dfK +bng +bng bng cYP cYP @@ -148398,7 +145830,7 @@ cYP cJg cJg daZ -dcn +ctj ddU cKY diG @@ -148630,9 +146062,9 @@ ccq coK cqr bYH -ctj +cFa cuu -bqv +bIX cxn cyF bBu @@ -148640,7 +146072,7 @@ cEj cEj cEn cxn -cGJ +buF boG cJo bRw @@ -148652,10 +146084,10 @@ cKO cUj cKO cKO -cKO +sYw cZM -cKO -dqW +kjL +cwc cSA cJg dgS @@ -148912,7 +146344,7 @@ dbi dbi cZN dbi -dco +cFo dfE cKY cJg @@ -149114,7 +146546,7 @@ bng bng abj btL -bvg +btL bwv bxG bwv @@ -149146,7 +146578,7 @@ cqr bYH cnO cti -dWO +bSz cxn cyH cAh @@ -149169,7 +146601,7 @@ cKV cKV dci cMq -don +ctd cSA dgx cSA @@ -149401,9 +146833,9 @@ cnK coM cqt bYH -ctj +cFa cuu -ckH +bwm cxn czU bBu @@ -149658,9 +147090,9 @@ cnL coN cqt bYH -ctj +cFa cuu -ckH +bwm cxn czU bBu @@ -149715,7 +147147,7 @@ dIX abj dKA dNi -dLT +dTu dMx dNk dRh @@ -149915,7 +147347,7 @@ cnM coO cqt bYH -ctj +cFa cuu cvW cxn @@ -150172,9 +147604,9 @@ cnM coM cqt bYH -ctj +cFa cuu -ckH +bwm cxn cyJ cAf @@ -150429,7 +147861,7 @@ cnN coP cqu bYH -ctj +cFa cuv cvX cxn @@ -150486,7 +147918,7 @@ abj abj dFH dNY -dLT +dTu dMz dNn dWT @@ -150926,9 +148358,9 @@ bJz bLt bNt bPp -bRc -bTg -bVm +bFU +rOn +bVk bXj bYM caG @@ -150938,9 +148370,9 @@ cga chL bYM ckR -cmn +coX chG -coQ +cDn cqv crV ctl @@ -151194,7 +148626,7 @@ cen cgb chM bYM -ckS +bHH cmo cnP coR @@ -151459,7 +148891,7 @@ cqw crW ctn byo -cwc +crW crW cyM crW @@ -151716,7 +149148,7 @@ cqw crX cto cuy -cwc +crW cxr cyN crX @@ -151996,7 +149428,7 @@ cYZ cZW cUr cKV -dtC +dqW cSF cJg dhe @@ -152230,7 +149662,7 @@ cqy crY ctq cuA -cwc +crW cxt cyP crW @@ -152459,8 +149891,8 @@ bxJ vnm bno eSX -hZF -bEw +bFX +bFX bEr bFX bMc @@ -152473,7 +149905,7 @@ bTj bVg bXn bYP -bXW +bYm ccD cer cgf @@ -152716,8 +150148,8 @@ bvm bwy bxK bzg -bzg -bCL +bJF +bJF bJF bJF bHT @@ -152729,7 +150161,7 @@ meB bTk bVp bXB -bYQ +bYR caM ccE ces @@ -152744,7 +150176,7 @@ cqA crZ cts cuC -cwe +cxv cxv cyR cxv @@ -152974,16 +150406,16 @@ bwz bxL bHS bAN -bCM -bHU -bHU -bHU -bHU +bAN +bAN +bAN +bAN +bAN bLz -bHU +bAN mtR mHP -bLz +bYa bVq bXp bYR @@ -153008,9 +150440,9 @@ cAm cYh cDp cvV -cFo +cFv cGS -cIe +cIk aFx cLn cbm @@ -153019,8 +150451,8 @@ cQd cRz cjF cUu -cWb -cWb +dyd +dyd cZd cZT dbq @@ -153275,7 +150707,7 @@ aFx aFx aFx cSX -cUv +dDE cXI dlz dlz @@ -153474,8 +150906,8 @@ bbo bcU bex bhc -blp -blp +uKI +bnq bka blT bno @@ -153512,7 +150944,7 @@ brS bgs coU cJn -ctc +bRc cqI brS cqI @@ -153527,12 +150959,12 @@ cGT cIg aFx cAq -cBW +iuU cOp aKh aFx cSY -cUv +dDE cXI cZb cZY @@ -153769,7 +151201,7 @@ gGu cnR gGu cqD -gGu +bTg khY cuF cqI @@ -153781,8 +151213,8 @@ aFv cEt bEY cGV -bKv -cEu +cIc +jHd cAq cAq cOq @@ -154249,7 +151681,7 @@ bhg biu bkd blV -bnp +boR boR bqQ bsI @@ -154287,12 +151719,12 @@ csd bqj ckW brS -aFx -aFx -aFx -aFx -aFx -aFx +oNd +oNd +oNd +oNd +oNd +oNd cFr cGW cIi @@ -154510,25 +151942,25 @@ blW boS bqR bHZ -bub -loP +blW +dnd tJH -bub +blW bzm -bHZ -bub -bub -bub +mKe +blW +blW +blW jUH -bub -bub +blW +blW bNH sEN bRi mKe blW blW -bnq +dnd caO blW cey @@ -154544,15 +151976,15 @@ cse bgs cuG cjm -aFx -aKh +oNd +lah cAo cBW -cAq -aFx +fqy +nFX bEY cGV -bKv +cIc aFx cLp cMN @@ -154560,7 +151992,7 @@ cOr cQg aFx cTa -cUv +dDE dlz cZh dac @@ -154764,23 +152196,23 @@ biw bHW blX blX -bkf -bqS blX +bqS +bCM reH hHM bwA -bxQ +bLD bnr bAT -bxQ -bxQ -bxQ -bNm -bxQ -bxQ bLD -mEG +bLD +bLD +bEw +bLD +bNE +bLD +bVm bRj bxQ bxQ @@ -154788,7 +152220,7 @@ bXt bYW bNm bxQ -cez +mEG bxQ chR cju @@ -154801,14 +152233,14 @@ csf bgt cuH bqj -aFx +oNd cyW cAp -cAq -cAq +tXj +wtE cEu cFs -cGV +rkJ cIj cJy cLp @@ -154817,7 +152249,7 @@ cLp cQi aFx cSY -cUv +dDE dlz cZi daR @@ -155021,7 +152453,7 @@ bhh bwE blY bhh -uSJ +bhi bqT bsL buc @@ -155058,12 +152490,12 @@ brS bgs cuH cmq -aFx +oNd cyX -cAq +oHv cBX aKk -aFx +nFX cFv cGV cIk @@ -155074,7 +152506,7 @@ cLp cQh aFx cTb -cUA +dDD dlz cZj daS @@ -155278,7 +152710,7 @@ bix bmO blZ bnt -boT +blZ bqU bsL bkj @@ -155315,12 +152747,12 @@ csg bgs ckX cmr -aFx -aFx -aFx -aFx -aFx -aFx +oNd +oNd +oNd +oNd +oNd +oNd cFu cGV cIk @@ -155331,7 +152763,7 @@ aFx aFx aFx cjn -cUv +dDE dlz dlz dbr @@ -155550,7 +152982,7 @@ bGj bLB bJM bLF -bNE +bLF bPv bRl obL @@ -155588,7 +153020,7 @@ cyY cyY aFx cTc -cUA +dDD cqC cMH cMH @@ -155807,7 +153239,7 @@ bGk bLB bGp bLG -nkh +bLG bPw hTr gwZ @@ -156064,7 +153496,7 @@ bGl bLB bJN bLG -nkh +bLG bPx bRl bNG @@ -156608,7 +154040,7 @@ jHa ctx cFx cGX -cIn +cJz cJz cLs cMQ @@ -156833,8 +154265,8 @@ bBa bBa bBa bBa -bBa -bBa +bHU +bPy bPy bPz bRo @@ -156856,25 +154288,25 @@ abj csj ctx cuL -czc +cIo cxx -czc -czc -czc -czc -czc +cIo +cIo +cIo +cIo +cIo cFy cIs cIo -czc -czc -czc -czc -czc +cIo +cIo +cIo +cIo +cIo cRB -czc +cIo cUF -cuM +coQ cJz csj abj @@ -157089,7 +154521,7 @@ blX blX blX blX -mHf +blX tRM bLK bPA @@ -157346,7 +154778,7 @@ bBc bJL bEx bEx -kzg +bEA tFO bIe bEx @@ -158857,7 +156289,7 @@ aaa acF abj abj -aIO +aIg aNQ aPg aQJ @@ -158910,9 +156342,9 @@ aaa aaa aaa csj -ctC -ctC -ctC +cFK +cFK +cFK csj csj csj @@ -158929,7 +156361,7 @@ csj csj csj csj -cUN +cFK cWi cXP csj