diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000000..7d4716f9122 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +patreon: ParadiseStation diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 8cef5ce91b9..3aabf9e3758 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -1,9 +1,9 @@ # This file has all the information on what versions of libraries are thrown into the code # For dreamchecker -export SPACEMANDMM_TAG=suite-1.6 +export SPACEMANDMM_TAG=suite-1.7 # For TGUI export NODE_VERSION=12 # Byond Major -export BYOND_MAJOR=513 +export BYOND_MAJOR=514 # Byond Minor -export BYOND_MINOR=1528 +export BYOND_MINOR=1566 diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e5f0121446b..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" @@ -11927,8 +11608,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -11975,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" = ( @@ -12004,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, @@ -12014,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) @@ -12023,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 @@ -12069,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, @@ -12126,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 @@ -12144,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 @@ -12175,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, @@ -12228,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, @@ -12264,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{ @@ -12329,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{ @@ -12362,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 @@ -12439,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; @@ -12487,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, @@ -12497,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" @@ -12512,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{ @@ -12563,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{ @@ -12617,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" @@ -12642,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" = ( @@ -12679,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, @@ -12721,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"; @@ -12813,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 @@ -12849,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, @@ -12859,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, @@ -12869,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{ @@ -12883,8 +12526,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/firealarm{ dir = 1; @@ -12897,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, @@ -12907,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, @@ -12924,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, @@ -12934,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, @@ -12950,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, @@ -12960,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, @@ -13008,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" @@ -13040,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{ @@ -13063,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 @@ -13100,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" @@ -13152,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{ @@ -13168,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; @@ -13180,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{ @@ -13220,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" = ( @@ -13266,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, @@ -13345,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, @@ -13412,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) @@ -13440,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) @@ -13454,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, @@ -13465,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, @@ -13476,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" @@ -13489,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, @@ -13500,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, @@ -13569,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{ @@ -13597,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) @@ -13606,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{ @@ -13651,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 @@ -13663,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 @@ -13678,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{ @@ -13697,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{ @@ -13721,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{ @@ -13740,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{ @@ -13789,8 +13396,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarport) @@ -13840,8 +13446,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -13879,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{ @@ -13895,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{ @@ -13913,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" }, @@ -13996,8 +13593,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -14037,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{ @@ -14147,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; @@ -14159,8 +13753,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -14182,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{ @@ -14195,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 @@ -14223,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{ @@ -14238,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, @@ -14283,8 +13871,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/firealarm{ dir = 8; @@ -14341,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 @@ -14357,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{ @@ -14368,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{ @@ -14387,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{ @@ -14401,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{ @@ -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" @@ -16942,7 +16467,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRf" = ( @@ -17020,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, @@ -17066,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" @@ -17081,7 +16600,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRt" = ( @@ -17096,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, @@ -17115,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 @@ -17143,7 +16659,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aRy" = ( @@ -17171,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" = ( @@ -17179,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" = ( @@ -17242,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, @@ -17281,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{ @@ -17300,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 @@ -17309,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" @@ -17450,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, @@ -17500,7 +17015,7 @@ }, /area/security/execution) "aSw" = ( -/obj/machinery/conveyor/east{ +/obj/machinery/conveyor/west{ id = "QMLoad" }, /turf/simulated/floor/plating, @@ -17600,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 @@ -17681,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 @@ -17690,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" @@ -17716,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, @@ -17731,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 @@ -17750,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{ @@ -17766,8 +17273,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -17786,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 @@ -17802,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{ @@ -17824,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{ @@ -17849,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; @@ -17881,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{ @@ -17894,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; @@ -17906,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" @@ -17947,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" = ( @@ -17966,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 @@ -17986,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, @@ -18009,7 +17505,7 @@ "aTp" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aTq" = ( @@ -18065,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{ @@ -18184,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" @@ -18230,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 @@ -18250,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" @@ -18264,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 @@ -18282,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{ @@ -18304,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{ @@ -18357,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, @@ -18478,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 @@ -18550,7 +18044,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUk" = ( @@ -18591,7 +18085,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUp" = ( @@ -18619,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) @@ -18628,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, @@ -18639,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, @@ -18660,7 +18150,7 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUx" = ( @@ -18705,7 +18195,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUC" = ( @@ -18723,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; @@ -18770,7 +18259,7 @@ "aUI" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUJ" = ( @@ -18779,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" = ( @@ -18788,7 +18277,7 @@ icon_state = "pipe-y" }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aUM" = ( @@ -18808,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" @@ -18827,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, @@ -18841,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 @@ -18907,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; @@ -18932,8 +18426,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 8 @@ -19003,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 @@ -19092,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{ @@ -19180,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{ @@ -19207,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; @@ -19370,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 @@ -19387,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 @@ -19412,7 +18899,7 @@ }, /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aVR" = ( @@ -19517,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{ @@ -19543,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" = ( @@ -19552,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" = ( @@ -19594,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 @@ -19653,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; @@ -19665,8 +19149,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -19682,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; @@ -19699,8 +19181,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -19716,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; @@ -19728,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 @@ -19746,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 @@ -19769,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{ @@ -19789,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{ @@ -19828,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 @@ -19849,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 @@ -19871,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 @@ -19991,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 @@ -20029,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 @@ -20274,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; @@ -20338,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) @@ -20365,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; @@ -20441,7 +19907,7 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aXI" = ( @@ -20449,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 @@ -20498,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 @@ -20555,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" @@ -20573,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 @@ -20585,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 @@ -20597,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" @@ -20605,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" }, @@ -20629,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{ @@ -20735,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{ @@ -20761,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, @@ -20996,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; @@ -21015,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 @@ -21040,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{ @@ -21064,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{ @@ -21079,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" @@ -21094,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, @@ -21116,8 +20569,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark{ name = "lightsout" @@ -21147,7 +20599,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aZc" = ( @@ -21160,7 +20612,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "aZd" = ( @@ -21174,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, @@ -21353,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{ @@ -21436,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, @@ -21470,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" @@ -21487,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, @@ -21506,8 +20945,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -21525,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"; @@ -21547,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 @@ -21561,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, @@ -21581,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 @@ -21601,8 +21034,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -21619,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"; @@ -21647,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 @@ -21671,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 @@ -21704,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"; @@ -21731,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, @@ -21753,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" = ( @@ -21783,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, @@ -21815,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{ @@ -21848,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{ @@ -21902,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, @@ -22034,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, @@ -22048,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"; @@ -22094,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, @@ -22154,7 +21570,7 @@ }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "baS" = ( @@ -22174,7 +21590,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" + icon_state = "bar" }, /area/crew_quarters/bar) "baU" = ( @@ -22303,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{ @@ -22333,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{ @@ -22401,8 +21815,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -22421,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{ @@ -22437,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 @@ -22460,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 @@ -22484,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, @@ -22528,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 @@ -22764,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" @@ -22838,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, @@ -22918,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{ @@ -22995,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" = ( @@ -23202,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, @@ -23238,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{ @@ -23250,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, @@ -23303,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, @@ -23415,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{ @@ -23472,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 @@ -23487,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 @@ -23502,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 @@ -23523,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 @@ -23541,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 @@ -23559,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{ @@ -23575,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"; @@ -23594,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, @@ -23636,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" @@ -23656,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{ @@ -23674,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 @@ -23691,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" @@ -23708,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 @@ -23754,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" = ( @@ -23777,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, @@ -23914,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{ @@ -23975,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{ @@ -23990,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, @@ -24238,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, @@ -24326,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, @@ -24350,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, @@ -24395,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{ @@ -24432,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, @@ -24486,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{ @@ -24557,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" @@ -24612,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, @@ -24630,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, @@ -24640,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{ @@ -24662,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, @@ -24689,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{ @@ -24833,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{ @@ -24872,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, @@ -25012,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{ @@ -25065,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, @@ -25136,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" @@ -25152,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" }, @@ -25179,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, @@ -25294,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" @@ -25405,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, @@ -25444,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, @@ -25475,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 @@ -25631,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 @@ -25649,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 @@ -25681,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{ @@ -25704,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{ @@ -25723,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 @@ -25840,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; @@ -25878,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, @@ -25917,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{ @@ -25936,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 @@ -25952,8 +25314,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light{ dir = 1; @@ -25973,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 @@ -26046,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; @@ -26266,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{ @@ -26308,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, @@ -26410,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, @@ -26433,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" }, @@ -26516,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, @@ -26543,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{ @@ -26581,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) @@ -26610,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{ @@ -26673,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 @@ -26687,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{ @@ -26706,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 @@ -26730,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" }, @@ -26747,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" }, @@ -26780,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" @@ -26789,8 +26146,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -26803,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" @@ -26812,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; @@ -26827,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, @@ -26855,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; @@ -26940,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, @@ -27060,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, @@ -27070,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{ @@ -27082,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, @@ -27092,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, @@ -27102,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, @@ -27123,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, @@ -27154,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 }, @@ -27230,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, @@ -27247,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{ @@ -27330,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 @@ -27415,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{ @@ -27562,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{ @@ -27628,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"; @@ -27686,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" @@ -27695,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; @@ -27728,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 @@ -27762,9 +27110,6 @@ }, /area/security/main) "bmd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, @@ -27806,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{ @@ -27938,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{ @@ -28036,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 @@ -28135,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" @@ -28219,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{ @@ -28371,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) @@ -28388,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 @@ -28424,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" @@ -28439,6 +27772,7 @@ name = "west bump"; pixel_x = -24 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -28448,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; @@ -28489,8 +27821,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -28516,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, @@ -28663,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, @@ -28776,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, @@ -28864,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, @@ -28960,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 @@ -28982,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 @@ -28994,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" @@ -29007,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 @@ -29019,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, @@ -29046,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"; @@ -29065,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; @@ -29091,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 }, @@ -29131,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" @@ -29161,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 @@ -29193,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{ @@ -29209,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; @@ -29218,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{ @@ -29229,9 +28525,6 @@ }, /area/security/main) "boY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 8; @@ -29239,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; @@ -29286,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; @@ -29351,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 @@ -29378,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" @@ -29401,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; @@ -29413,8 +28695,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -29424,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"; @@ -29439,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" @@ -29450,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{ @@ -29468,8 +28746,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; @@ -29702,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; @@ -29782,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 @@ -29801,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 @@ -29816,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{ @@ -29829,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{ @@ -29842,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 @@ -29857,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{ @@ -29873,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, @@ -29887,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 @@ -29899,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 @@ -29916,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; @@ -29982,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 @@ -30019,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 @@ -30044,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"; @@ -30095,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; @@ -30108,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 @@ -30145,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 @@ -30193,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{ @@ -30207,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) @@ -30237,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 @@ -30272,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 @@ -30293,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 @@ -30318,8 +29566,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -30330,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" @@ -30364,8 +29613,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -30388,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 @@ -30414,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 @@ -30431,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 @@ -30451,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" @@ -30473,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{ @@ -30489,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 @@ -30520,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 @@ -30537,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 }, @@ -30548,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" }, @@ -30657,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, @@ -30669,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, @@ -30702,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 @@ -30869,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"; @@ -30899,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, @@ -30964,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 }, @@ -31073,8 +30309,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -31093,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{ @@ -31136,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 @@ -31157,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"; @@ -31189,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 @@ -31210,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" @@ -31225,6 +30455,7 @@ req_access_txt = "63"; req_one_access_txt = null }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31251,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" @@ -31262,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 @@ -31315,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, @@ -31481,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, @@ -31502,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{ @@ -31515,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{ @@ -31532,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{ @@ -31545,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, @@ -31559,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, @@ -31599,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{ @@ -31660,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; @@ -31676,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{ @@ -31711,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, @@ -31756,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" = ( @@ -31798,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 @@ -31814,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{ @@ -31850,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) @@ -31918,6 +31128,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31970,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, @@ -31990,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" @@ -32124,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{ @@ -32168,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{ @@ -32188,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 @@ -32232,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 @@ -32271,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; @@ -32346,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, @@ -32362,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; @@ -32403,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" = ( @@ -32419,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, @@ -32434,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; @@ -32450,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" = ( @@ -32469,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" }, @@ -32483,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 @@ -32492,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" }, @@ -32500,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" @@ -32516,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" }, @@ -32552,8 +31766,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -32564,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" }, @@ -32605,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" @@ -32616,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 @@ -32630,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 @@ -32717,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{ @@ -32768,8 +31981,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -32789,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 @@ -32804,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"; @@ -32833,8 +32043,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/plasticflaps{ opacity = 1 @@ -32875,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{ @@ -32891,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{ @@ -32923,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{ @@ -32979,8 +32183,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 4; @@ -33000,8 +32203,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -33025,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; @@ -33064,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; @@ -33102,8 +32301,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 2; @@ -33127,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; @@ -33148,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; @@ -33231,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" }, @@ -33273,6 +32467,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -33393,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; @@ -33502,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, @@ -33564,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{ @@ -33640,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{ @@ -33671,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" @@ -33702,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{ @@ -33735,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"; @@ -33753,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 @@ -33772,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 @@ -33789,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 @@ -33810,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 @@ -33827,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 @@ -33842,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 @@ -33858,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) @@ -33886,7 +33063,6 @@ }, /area/security/prisonershuttle) "bxK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -33904,6 +33080,7 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -33950,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" @@ -34001,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) @@ -34029,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) @@ -34043,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) @@ -34060,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) @@ -34188,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{ @@ -34234,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 @@ -34249,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 @@ -34272,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, @@ -34304,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 @@ -34334,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"; @@ -34360,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, @@ -34381,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; @@ -34394,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) @@ -34409,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{ @@ -34423,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" @@ -34433,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, @@ -34447,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; @@ -34499,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 @@ -34526,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 @@ -34580,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; @@ -34627,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" @@ -34637,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 @@ -34678,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 @@ -34706,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 @@ -34723,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 @@ -34746,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{ @@ -34764,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 @@ -34856,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; @@ -34956,8 +34112,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -34992,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, @@ -35064,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 @@ -35111,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, @@ -35133,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{ @@ -35229,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{ @@ -35242,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{ @@ -35254,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{ @@ -35266,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{ @@ -35297,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{ @@ -35375,8 +34521,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -35386,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 @@ -35404,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 @@ -35422,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; @@ -35471,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 @@ -35486,6 +34626,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -35518,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; @@ -35668,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, @@ -35729,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{ @@ -35756,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{ @@ -35826,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; @@ -35838,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, @@ -35923,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 @@ -35969,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; @@ -36010,8 +35140,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/plasticflaps{ opacity = 1 @@ -36061,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, @@ -36115,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 @@ -36149,8 +35276,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36160,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 @@ -36190,8 +35315,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36201,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 @@ -36224,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 @@ -36241,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 @@ -36258,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 @@ -36292,8 +35411,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36303,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 @@ -36323,8 +35440,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36343,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 @@ -36361,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 @@ -36386,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 @@ -36399,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" @@ -36410,8 +35522,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36431,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 @@ -36440,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 @@ -36454,8 +35563,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36479,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 @@ -36499,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 @@ -36533,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 @@ -36550,8 +35654,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -36561,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 @@ -36584,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 @@ -36602,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 @@ -36620,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 @@ -36673,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; @@ -36690,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, @@ -36933,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{ @@ -36953,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{ @@ -36975,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{ @@ -36991,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{ @@ -37007,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{ @@ -37023,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{ @@ -37039,8 +36132,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -37060,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, @@ -37074,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{ @@ -37095,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, @@ -37109,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 @@ -37131,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 @@ -37152,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 @@ -37189,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, @@ -37201,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, @@ -37231,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 @@ -37292,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; @@ -37304,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; @@ -37376,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{ @@ -37423,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, @@ -37448,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 @@ -37466,8 +36543,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -37477,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 @@ -37527,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, @@ -37560,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{ @@ -37577,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" }, @@ -37590,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" }, @@ -37598,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{ @@ -37613,6 +36691,9 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -37644,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" @@ -37662,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) @@ -37694,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 @@ -37766,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{ @@ -37783,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{ @@ -37820,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, @@ -37908,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; @@ -37920,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, @@ -37998,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{ @@ -38109,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 @@ -38215,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 @@ -38263,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 @@ -38296,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, @@ -38333,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) @@ -38363,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) @@ -38396,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 @@ -38498,8 +37567,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -38614,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, @@ -38681,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 @@ -38709,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 @@ -38730,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{ @@ -38749,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{ @@ -38775,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{ @@ -38797,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, @@ -38817,8 +37877,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "lightsout" @@ -38841,8 +37900,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -38852,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{ @@ -38878,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 @@ -38899,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, @@ -38930,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 @@ -38985,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 @@ -39000,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 @@ -39110,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 @@ -39126,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" = ( @@ -39165,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, @@ -39176,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{ @@ -39224,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, @@ -39301,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, @@ -39313,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{ @@ -39336,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; @@ -39360,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, @@ -39375,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, @@ -39385,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, @@ -39395,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, @@ -39414,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) @@ -39423,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, @@ -39446,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{ @@ -39479,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" @@ -39548,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) @@ -39568,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; @@ -39580,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; @@ -39623,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{ @@ -39636,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; @@ -39849,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, @@ -39962,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, @@ -40023,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" @@ -40043,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{ @@ -40080,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, @@ -40102,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"; @@ -40145,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, @@ -40241,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"; @@ -40254,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" @@ -40270,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 @@ -40284,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 @@ -40298,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; @@ -40460,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 @@ -40585,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, @@ -40657,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 @@ -40677,8 +39677,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -40688,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{ @@ -40711,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 @@ -40732,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 @@ -40753,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 @@ -40768,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 @@ -40784,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{ @@ -40816,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, @@ -40864,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{ @@ -40880,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 }, @@ -40910,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{ @@ -40929,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{ @@ -40977,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) @@ -40987,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, @@ -41025,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, @@ -41064,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 @@ -41085,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{ @@ -41113,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, @@ -41171,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) @@ -41235,7 +40165,6 @@ }, /area/security/detectives_office) "bLt" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "carpet" }, @@ -41275,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 }, @@ -41310,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; @@ -41323,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" @@ -41335,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{ @@ -41375,7 +40294,6 @@ }, /area/security/processing) "bLK" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41464,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{ @@ -41485,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{ @@ -41509,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"; @@ -41538,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, @@ -41555,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" @@ -41577,8 +40496,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -41667,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" @@ -41728,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, @@ -41810,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, @@ -41834,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; @@ -41887,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; @@ -41902,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, @@ -41936,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 @@ -41964,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, @@ -41973,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 @@ -41993,8 +40901,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42007,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{ @@ -42052,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, @@ -42080,8 +40982,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42091,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{ @@ -42142,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, @@ -42177,7 +41064,6 @@ }, /area/storage/tools) "bNk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -42189,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" @@ -42236,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" }, @@ -42256,7 +41143,6 @@ }, /area/security/detectives_office) "bNt" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair/office/dark{ dir = 8 }, @@ -42323,9 +41209,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bND" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -42335,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{ @@ -42361,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, @@ -42380,9 +41254,6 @@ }, /area/security/brig) "bNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -42455,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 @@ -42482,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{ @@ -42570,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" @@ -42581,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 @@ -42599,8 +41466,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -42676,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, @@ -42720,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, @@ -42752,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{ @@ -42825,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{ @@ -42848,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{ @@ -42871,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, @@ -42882,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, @@ -42924,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 @@ -42972,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, @@ -42988,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, @@ -43024,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, @@ -43072,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" = ( @@ -43149,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" }, @@ -43169,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{ @@ -43188,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" @@ -43210,8 +42047,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -43224,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, @@ -43246,6 +42081,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPw" = ( @@ -43259,6 +42097,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "bPx" = ( @@ -43267,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" @@ -43284,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 }, @@ -43311,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"; @@ -43337,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; @@ -43355,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"; @@ -43384,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; @@ -43412,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 @@ -43579,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"; @@ -43615,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, @@ -43666,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, @@ -43752,6 +42586,9 @@ icon_state = "1-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43844,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" @@ -43858,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, @@ -43907,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{ @@ -43917,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{ @@ -43937,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, @@ -43950,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{ @@ -43979,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, @@ -44020,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{ @@ -44035,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" = ( @@ -44063,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{ @@ -44092,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{ @@ -44126,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" @@ -44136,8 +42952,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -44146,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 @@ -44176,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 @@ -44190,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{ @@ -44216,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 @@ -44246,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" @@ -44258,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" @@ -44575,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{ @@ -44626,8 +43440,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -44637,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{ @@ -44659,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 @@ -44676,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 @@ -44693,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" @@ -44730,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, @@ -44746,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, @@ -44760,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; @@ -44796,8 +43601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -44815,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; @@ -44845,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, @@ -44864,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; @@ -44876,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; @@ -44895,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; @@ -44917,8 +43716,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -44954,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, @@ -45033,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 @@ -45044,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" = ( @@ -45064,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" @@ -45109,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" @@ -45151,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" @@ -45201,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, @@ -45307,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{ @@ -45328,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 @@ -45351,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 @@ -45404,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, @@ -45645,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 @@ -45680,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, @@ -45690,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, @@ -45704,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; @@ -45716,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, @@ -45816,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; @@ -45865,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" @@ -45884,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"; @@ -45899,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 @@ -45921,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, @@ -45954,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 @@ -46022,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"; @@ -46114,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"; @@ -46166,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, @@ -46215,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" = ( @@ -46282,8 +45049,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -46306,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" @@ -46324,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, @@ -46334,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 @@ -46352,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 @@ -46387,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 @@ -46414,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 @@ -46471,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 @@ -46542,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, @@ -46577,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, @@ -46597,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, @@ -46608,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" }, @@ -46621,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) @@ -47001,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; @@ -47076,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; @@ -47203,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{ @@ -47218,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"; @@ -47237,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, @@ -47261,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; @@ -47290,9 +46024,6 @@ }, /area/hallway/primary/starboard) "bXf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -47301,6 +46032,9 @@ pixel_y = -24 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -47309,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 @@ -47325,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" }, @@ -47370,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" }, @@ -47395,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{ @@ -47431,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{ @@ -47453,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 }, @@ -47463,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" @@ -47492,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"; @@ -47667,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'"; @@ -47701,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; @@ -47729,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 @@ -47783,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{ @@ -47796,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) @@ -47835,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 }, @@ -47892,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 @@ -47934,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 }, @@ -47962,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, @@ -47971,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{ @@ -47989,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{ @@ -48047,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 @@ -48059,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 @@ -48077,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 @@ -48095,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 @@ -48114,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 @@ -48123,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 @@ -48146,8 +46848,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d2 = 8; @@ -48185,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" }, @@ -48322,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, @@ -48338,8 +47045,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -48354,8 +47060,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -48367,8 +47072,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -48534,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 @@ -48573,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, @@ -48661,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, @@ -48679,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 @@ -48688,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" = ( @@ -48698,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{ @@ -48709,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{ @@ -48783,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" }, @@ -48848,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" }, @@ -48919,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 @@ -48934,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 @@ -49232,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" }, @@ -49259,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" @@ -49339,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, @@ -49354,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{ @@ -49405,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; @@ -49495,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, @@ -49508,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{ @@ -49538,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, @@ -49562,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, @@ -49574,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{ @@ -49583,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, @@ -49647,9 +48311,7 @@ }, /area/blueshield) "ccg" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/blueshield) "cch" = ( /obj/structure/table/wood, @@ -49672,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; @@ -49804,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 @@ -49819,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 @@ -49834,8 +48472,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -49857,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 @@ -49885,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 @@ -49900,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 @@ -49943,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 @@ -49955,6 +48585,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -49964,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{ @@ -50004,7 +48633,7 @@ }, /area/magistrateoffice) "ccL" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/light/small{ dir = 8 }, @@ -50013,7 +48642,7 @@ }, /area/security/evidence) "ccM" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -50046,7 +48675,7 @@ }, /area/crew_quarters/courtroom) "ccP" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/light/small{ dir = 4 }, @@ -50160,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{ @@ -50291,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{ @@ -50316,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, @@ -50354,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, @@ -50367,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, @@ -50495,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, @@ -50516,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{ @@ -50544,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, @@ -50619,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; @@ -50648,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, @@ -50682,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{ @@ -50733,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"; @@ -50780,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" @@ -50841,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 @@ -50890,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; @@ -50976,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, @@ -51044,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" @@ -51064,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; @@ -51076,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) @@ -51086,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, @@ -51097,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) @@ -51130,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, @@ -51160,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, @@ -51192,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, @@ -51207,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, @@ -51241,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{ @@ -51254,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, @@ -51271,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; @@ -51351,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{ @@ -51372,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{ @@ -51391,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 @@ -51462,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, @@ -51487,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" }, @@ -51507,7 +49981,7 @@ /turf/simulated/floor/carpet, /area/magistrateoffice) "cgg" = ( -/obj/structure/closet/secure_closet, +/obj/structure/closet, /obj/machinery/alarm{ pixel_y = 24 }, @@ -51545,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 @@ -51564,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" }, @@ -51576,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 @@ -51593,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 @@ -51608,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 @@ -51647,6 +50117,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/closet, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51768,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) @@ -51819,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, @@ -51829,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, @@ -51855,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" @@ -51863,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" @@ -51899,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, @@ -51913,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, @@ -52007,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, @@ -52038,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 @@ -52048,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 @@ -52067,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" = ( @@ -52108,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, @@ -52122,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; @@ -52170,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, @@ -52209,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"; @@ -52279,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" @@ -52296,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{ @@ -52460,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{ @@ -52503,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 }, @@ -52521,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{ @@ -52538,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, @@ -52551,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{ @@ -52562,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; @@ -52585,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; @@ -52604,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 @@ -52617,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" @@ -52633,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 }, @@ -52668,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{ @@ -52687,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; @@ -52711,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; @@ -52734,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, @@ -52759,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, @@ -52774,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{ @@ -52783,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" = ( @@ -52890,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 @@ -52941,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{ @@ -52954,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" = ( @@ -53024,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) @@ -53090,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{ @@ -53262,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" = ( @@ -53293,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) @@ -53308,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"; @@ -53330,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, @@ -53340,7 +51733,6 @@ }, /area/library) "cki" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 @@ -53349,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{ @@ -53403,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) @@ -53431,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{ @@ -53453,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{ @@ -53476,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" = ( @@ -53515,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" = ( @@ -53540,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" = ( @@ -53555,9 +51926,6 @@ /area/security/range) "ckF" = ( /obj/machinery/teleport/hub, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/teleporter) "ckG" = ( @@ -53566,9 +51934,6 @@ id_tag = "teleaccessshutter"; name = "Teleporter Access Shutters" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/teleporter) "ckH" = ( @@ -53576,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 @@ -53649,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{ @@ -53672,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" @@ -53689,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; @@ -53732,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 @@ -53753,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 @@ -53771,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 @@ -53792,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 @@ -53811,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 @@ -53836,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 @@ -53861,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, @@ -53884,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{ @@ -53906,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 @@ -53919,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; @@ -53938,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) @@ -53947,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, @@ -53957,8 +52287,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "blobstart" @@ -53969,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, @@ -53995,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{ @@ -54069,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, @@ -54088,7 +52413,6 @@ }, /area/maintenance/port) "clA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -54101,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, @@ -54112,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, @@ -54205,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 @@ -54239,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 @@ -54256,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; @@ -54305,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" @@ -54324,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, @@ -54376,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 @@ -54395,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" = ( @@ -54410,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 @@ -54419,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" = ( @@ -54490,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 @@ -54514,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{ @@ -54541,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" = ( @@ -54592,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, @@ -54639,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) @@ -54844,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{ @@ -54921,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{ @@ -54940,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, @@ -54957,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, @@ -54967,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, @@ -54986,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, @@ -55056,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, @@ -55112,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" @@ -55134,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{ @@ -55148,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" = ( @@ -55175,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"; @@ -55329,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" = ( @@ -55396,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, @@ -55441,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, @@ -55460,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, @@ -55471,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, @@ -55580,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{ @@ -55626,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" }, @@ -55639,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) @@ -55661,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" = ( @@ -55857,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; @@ -55878,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 @@ -55984,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, @@ -55999,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{ @@ -56044,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 @@ -56091,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, @@ -56109,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 @@ -56121,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 @@ -56142,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 @@ -56160,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 @@ -56178,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 @@ -56193,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 @@ -56209,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, @@ -56226,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 @@ -56241,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 @@ -56257,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 @@ -56275,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 @@ -56296,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 @@ -56317,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 }, @@ -56331,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 @@ -56347,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 @@ -56363,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 @@ -56379,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 @@ -56399,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 @@ -56453,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" @@ -56481,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 @@ -56565,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" = ( @@ -56590,8 +54827,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -56607,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 @@ -56754,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, @@ -56779,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, @@ -56834,8 +55067,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -56854,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" @@ -56865,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 @@ -56883,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 @@ -56894,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"; @@ -56910,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; @@ -56928,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; @@ -56974,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'"; @@ -57014,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; @@ -57037,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{ @@ -57067,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, @@ -57081,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{ @@ -57100,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; @@ -57128,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 @@ -57172,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 @@ -57200,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; @@ -57217,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 @@ -57245,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 @@ -57289,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" @@ -57298,8 +55504,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -57316,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" = ( @@ -57331,7 +55539,6 @@ pixel_y = -24 }, /obj/structure/table, -/obj/item/clothing/under/rank/security, /turf/simulated/floor/plating, /area/maintenance/starboard2) "csf" = ( @@ -57350,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" = ( @@ -57573,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{ @@ -57604,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" = ( @@ -57622,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 @@ -57634,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 @@ -57646,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 @@ -57655,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{ @@ -57671,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 @@ -57680,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 @@ -57692,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 @@ -57703,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) @@ -57712,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, @@ -57746,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{ @@ -57803,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; @@ -57886,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; @@ -57911,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" = ( @@ -57973,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{ @@ -58167,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, @@ -58198,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, @@ -58235,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 @@ -58253,7 +56441,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/bridge/meeting_room) +/area/hallway/primary/central/south) "cud" = ( /obj/structure/cable{ d1 = 1; @@ -58263,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 @@ -58285,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, @@ -58346,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) @@ -58379,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" @@ -58453,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 @@ -58521,7 +56702,6 @@ }, /area/crew_quarters/locker) "cuC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; initialize_directions = 11 @@ -58541,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; @@ -58556,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 @@ -58575,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 @@ -58593,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 @@ -58612,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" @@ -58627,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 @@ -58642,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 @@ -58664,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" @@ -58680,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{ @@ -58812,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) @@ -58821,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{ @@ -58834,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{ @@ -58850,8 +57018,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -58861,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, @@ -58912,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 @@ -58923,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" }, @@ -59031,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{ @@ -59072,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, @@ -59094,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{ @@ -59150,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, @@ -59161,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, @@ -59234,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; @@ -59251,9 +57406,6 @@ }, /area/hallway/primary/central) "cvX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -24 @@ -59269,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; @@ -59284,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" }, @@ -59314,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{ @@ -59349,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 @@ -59358,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" }, @@ -59366,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 @@ -59375,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" }, @@ -59396,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, @@ -59481,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) @@ -59670,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 @@ -59684,8 +57828,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -59707,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 @@ -59721,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 @@ -59753,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{ @@ -59797,8 +57930,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -59816,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) @@ -59883,8 +58014,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 8 @@ -59940,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{ @@ -59955,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; @@ -59970,6 +58097,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -60025,7 +58153,6 @@ }, /area/crew_quarters/fitness) "cxD" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 11 @@ -60077,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, @@ -60095,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) @@ -60134,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, @@ -60143,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" @@ -60294,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) @@ -60338,7 +58453,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Showroom" + c_tag = "Public Meeting Room" }, /turf/simulated/floor/carpet, /area/assembly/showroom) @@ -60350,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, @@ -60402,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 @@ -60446,8 +58555,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -60528,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" }, @@ -60578,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{ @@ -60591,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; @@ -60603,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{ @@ -60616,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, @@ -60631,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, @@ -60648,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{ @@ -60661,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{ @@ -60680,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, @@ -60747,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{ @@ -60818,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{ @@ -60978,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{ @@ -61005,8 +59086,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -61050,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; @@ -61122,8 +59201,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d2 = 4; @@ -61139,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{ @@ -61174,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; @@ -61202,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, @@ -61219,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, @@ -61230,8 +59296,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -61247,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, @@ -61259,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{ @@ -61292,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{ @@ -61314,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, @@ -61368,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, @@ -61429,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 @@ -61460,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{ @@ -61473,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; @@ -61495,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{ @@ -61659,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) @@ -61679,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{ @@ -61691,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; @@ -61703,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, @@ -61759,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) @@ -61872,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; @@ -61948,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, @@ -61969,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{ @@ -62004,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, @@ -62043,8 +60080,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -62054,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{ @@ -62074,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 @@ -62122,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, @@ -62133,8 +60166,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -62148,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) @@ -62157,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 @@ -62169,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, @@ -62179,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" @@ -62222,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{ @@ -62264,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{ @@ -62315,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{ @@ -62453,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, @@ -62471,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; @@ -62527,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{ @@ -62617,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, @@ -62648,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, @@ -62674,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{ @@ -62705,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 }, @@ -62738,8 +60770,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -62760,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, @@ -62809,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" @@ -62824,7 +60853,6 @@ }, /area/crew_quarters/locker) "cDp" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63010,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, @@ -63082,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; @@ -63236,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" = ( @@ -63263,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" @@ -63343,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; @@ -63451,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; @@ -63513,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{ @@ -63581,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, @@ -63592,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, @@ -63616,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{ @@ -63629,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; @@ -63647,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" @@ -63659,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" @@ -63674,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; @@ -63686,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" @@ -63698,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; @@ -63707,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" @@ -63949,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 @@ -63967,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{ @@ -63993,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{ @@ -64012,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{ @@ -64037,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 @@ -64055,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{ @@ -64077,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 @@ -64102,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{ @@ -64127,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{ @@ -64146,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 @@ -64167,8 +62197,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64191,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 @@ -64212,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 @@ -64231,8 +62258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64253,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{ @@ -64272,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 @@ -64290,8 +62314,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/landmark{ name = "blobstart" @@ -64311,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 @@ -64330,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{ @@ -64350,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, @@ -64370,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{ @@ -64395,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{ @@ -64423,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{ @@ -64451,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 @@ -64473,8 +62488,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -64490,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{ @@ -64507,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"; @@ -64536,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" @@ -64555,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; @@ -64588,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 }, @@ -64611,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{ @@ -64648,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 @@ -64664,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" = ( @@ -64721,7 +62722,6 @@ }, /area/crew_quarters/sleep) "cGS" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -64761,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 @@ -64849,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"; @@ -64876,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, @@ -64913,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; @@ -64932,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; @@ -64971,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{ @@ -65027,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 @@ -65050,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" @@ -65072,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" @@ -65087,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" @@ -65112,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" }, @@ -65128,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" }, @@ -65156,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" @@ -65254,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 }, @@ -65276,9 +63222,6 @@ }, /area/crew_quarters/sleep) "cIh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; @@ -65290,9 +63233,6 @@ }, /area/crew_quarters/sleep) "cIi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/power/apc{ name = "south bump"; @@ -65308,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" @@ -65372,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{ @@ -65396,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; @@ -65410,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" @@ -65454,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" @@ -65492,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, @@ -65594,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, @@ -65628,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" @@ -65682,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" = ( @@ -65695,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, @@ -65766,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" }, @@ -65956,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 }, @@ -65996,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 @@ -66048,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{ @@ -66065,8 +63985,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/landmark{ name = "blobstart" @@ -66104,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{ @@ -66145,7 +64060,6 @@ }, /area/medical/research) "cKx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/chair, /turf/simulated/floor/plasteel{ dir = 1; @@ -66153,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{ @@ -66211,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; @@ -66244,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, @@ -66353,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{ @@ -66390,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; @@ -66408,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; @@ -66417,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; @@ -66464,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 @@ -66486,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 @@ -66501,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 @@ -66517,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" = ( @@ -66537,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, @@ -66615,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" @@ -66635,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, @@ -66690,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, @@ -66718,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, @@ -66728,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, @@ -66751,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; @@ -66812,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, @@ -66827,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, @@ -66844,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; @@ -66867,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, @@ -66890,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 }, @@ -66906,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" @@ -66918,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" @@ -67040,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; @@ -67054,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 @@ -67110,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, @@ -67206,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; @@ -67232,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{ @@ -67273,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 }, @@ -67285,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" }, @@ -67293,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{ @@ -67324,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{ @@ -67349,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"; @@ -67372,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"; @@ -67410,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"; @@ -67445,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; @@ -67479,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{ @@ -67516,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 }, @@ -67572,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 }, @@ -67630,7 +65492,6 @@ /turf/simulated/floor/plasteel, /area/medical/research) "cNN" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67651,7 +65512,6 @@ }, /area/hallway/primary/aft) "cNP" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67703,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" @@ -67715,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 }, @@ -67728,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" }, @@ -67792,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{ @@ -67821,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, @@ -67955,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) @@ -67967,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, @@ -68076,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, @@ -68150,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{ @@ -68185,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{ @@ -68251,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" @@ -68264,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" @@ -68304,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{ @@ -68314,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; @@ -68412,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{ @@ -68420,7 +66228,6 @@ }, /area/medical/research) "cPq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -68436,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 }, @@ -68482,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, @@ -68504,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 }, @@ -68525,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" @@ -68541,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" }, @@ -68584,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" }, @@ -68604,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, @@ -68717,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"; @@ -68729,6 +66515,9 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -68769,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, @@ -68899,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{ @@ -68939,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, @@ -68972,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, @@ -68983,8 +66758,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -69011,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; @@ -69031,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" }, @@ -69071,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{ @@ -69111,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{ @@ -69141,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, @@ -69161,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" @@ -69170,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{ @@ -69198,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{ @@ -69235,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{ @@ -69252,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 @@ -69278,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; @@ -69311,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" @@ -69368,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" = ( @@ -69396,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, @@ -69437,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 @@ -69471,7 +67212,6 @@ }, /area/crew_quarters/fitness) "cRB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -69480,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" @@ -69562,8 +67302,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -69594,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; @@ -69629,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{ @@ -69641,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" @@ -69661,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 @@ -69689,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" @@ -69731,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 @@ -69753,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" @@ -69796,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 @@ -69829,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" @@ -69860,7 +67582,6 @@ }, /area/toxins/xenobiology) "cSr" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, @@ -69936,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" @@ -69993,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" }, @@ -70013,7 +67739,6 @@ /turf/simulated/floor/wood, /area/medical/psych) "cSJ" = ( -/obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -70026,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{ @@ -70050,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 @@ -70080,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"; @@ -70277,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 @@ -70300,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{ @@ -70330,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; @@ -70357,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{ @@ -70375,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{ @@ -70393,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"; @@ -70419,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, @@ -70450,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 @@ -70461,7 +68176,6 @@ }, /area/toxins/xenobiology) "cTB" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -70470,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"; @@ -70494,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; @@ -70564,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."; @@ -70627,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{ @@ -70653,7 +68378,6 @@ }, /area/medical/research) "cTV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, @@ -70666,7 +68390,6 @@ }, /area/hallway/primary/aft) "cTW" = ( -/obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -70711,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" = ( @@ -70782,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{ @@ -70799,7 +68517,7 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/medical/psych) "cUj" = ( /obj/machinery/light{ @@ -70866,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" @@ -70895,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; @@ -70931,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 @@ -70967,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 @@ -70986,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 @@ -71007,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 @@ -71022,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 @@ -71043,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 @@ -71065,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 @@ -71084,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 @@ -71105,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; @@ -71116,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" @@ -71202,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, @@ -71249,8 +68910,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; @@ -71265,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{ @@ -71281,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" }, @@ -71311,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" = ( @@ -71333,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, @@ -71345,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" @@ -71364,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" @@ -71387,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{ @@ -71421,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, @@ -71446,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" @@ -71536,7 +69177,6 @@ /turf/simulated/floor/plating, /area/toxins/lab) "cVA" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -71599,25 +69239,21 @@ /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, @@ -71676,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, @@ -71707,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{ @@ -71758,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) @@ -71776,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" @@ -71811,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, @@ -71914,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 @@ -71928,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 @@ -71977,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{ @@ -72013,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{ @@ -72031,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" = ( @@ -72112,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; @@ -72126,8 +69729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72144,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" @@ -72180,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, @@ -72293,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 @@ -72344,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" = ( @@ -72368,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 @@ -72460,8 +70053,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -72542,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" }, @@ -72600,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, @@ -72622,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, @@ -72664,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, @@ -72674,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" @@ -72685,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) @@ -72694,8 +70276,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72714,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" @@ -72739,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, @@ -72762,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" @@ -72774,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, @@ -72791,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{ @@ -72839,26 +70378,13 @@ }, /area/toxins/lab) "cYz" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/effect/decal/warning_stripes/yellow, -/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/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow, -/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"; @@ -72867,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" }, @@ -72902,6 +70428,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72973,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" }, @@ -73013,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" @@ -73097,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{ @@ -73175,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" @@ -73222,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"; @@ -73248,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" @@ -73256,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, @@ -73291,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" }, @@ -73311,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" @@ -73322,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 @@ -73407,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 @@ -73416,6 +70922,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73452,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" @@ -73470,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" @@ -73483,7 +70990,6 @@ }, /area/medical/medbay3) "cZR" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -73507,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; @@ -73539,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" }, @@ -73664,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) @@ -73688,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 @@ -73705,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{ @@ -73723,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 @@ -73738,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 @@ -73797,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 @@ -73807,6 +71304,9 @@ dir = 1; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -73816,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, @@ -73836,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) @@ -73849,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; @@ -73870,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) @@ -73884,8 +71379,8 @@ on = 1 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + dir = 1; + icon_state = "whitepurple" }, /area/medical/research) "daG" = ( @@ -73908,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" @@ -73935,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{ @@ -73968,9 +71466,6 @@ }, /area/hallway/primary/aft) "daO" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/structure/sign/chemistry{ pixel_x = 32; pixel_y = 32 @@ -73980,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{ @@ -73990,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, @@ -74016,8 +71508,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -74043,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" @@ -74064,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" @@ -74100,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" }, @@ -74117,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, @@ -74142,6 +71634,7 @@ }, /area/medical/medbay) "dbj" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -74150,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, @@ -74187,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{ @@ -74217,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, @@ -74276,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 @@ -74292,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" = ( @@ -74309,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) @@ -74318,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; @@ -74334,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" }, @@ -74349,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 @@ -74366,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" = ( @@ -74396,6 +71881,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -74422,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" }, @@ -74467,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" }, @@ -74513,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" @@ -74538,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" @@ -74547,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" @@ -74596,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" = ( @@ -74626,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" @@ -74664,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 @@ -74682,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 @@ -74697,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, @@ -74707,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" }, @@ -74737,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 @@ -74747,6 +72240,9 @@ dir = 4 }, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "white" @@ -74756,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; @@ -74772,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" }, @@ -74780,8 +72277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -74794,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" }, @@ -74802,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 @@ -74858,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{ @@ -74877,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; @@ -74889,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; @@ -74907,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" = ( @@ -74926,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 @@ -74943,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 @@ -74974,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{ @@ -75006,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, @@ -75020,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{ @@ -75054,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 }, @@ -75138,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, @@ -75186,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" @@ -75218,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" = ( @@ -75282,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 @@ -75310,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, @@ -75334,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{ @@ -75350,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, @@ -75402,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 @@ -75468,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" @@ -75478,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, @@ -75489,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" }, @@ -75535,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" @@ -75546,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; @@ -75613,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, @@ -75625,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" }, @@ -75642,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; @@ -75675,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; @@ -75684,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"; @@ -75709,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, @@ -75728,8 +73173,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -75755,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, @@ -75791,8 +73234,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/shower{ dir = 4 @@ -75833,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{ @@ -75844,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; @@ -75897,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" @@ -75908,8 +73340,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -75929,8 +73360,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -75947,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{ @@ -75971,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, @@ -76045,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{ @@ -76061,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{ @@ -76132,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{ @@ -76169,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{ @@ -76246,8 +73669,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -76265,8 +73687,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 2; @@ -76320,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{ @@ -76333,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{ @@ -76351,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{ @@ -76423,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 }, @@ -76449,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 @@ -76465,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, @@ -76495,8 +73908,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -76518,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, @@ -76561,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{ @@ -76589,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, @@ -76620,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" @@ -76695,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; @@ -76713,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" @@ -76740,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, @@ -76760,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"; @@ -76788,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, @@ -76803,7 +74204,6 @@ }, /area/medical/research) "dgw" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; @@ -76823,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" }, @@ -76849,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, @@ -76861,7 +74259,6 @@ }, /area/medical/medbay) "dgC" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 8 }, @@ -76968,6 +74365,8 @@ }, /area/medical/genetics_cloning) "dgM" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -77012,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" }, @@ -77085,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, @@ -77146,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) @@ -77265,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{ @@ -77308,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"; @@ -77336,8 +74729,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -77365,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{ @@ -77385,8 +74776,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -77411,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{ @@ -77431,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; @@ -77444,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 @@ -77460,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 @@ -77480,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" }, @@ -77507,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; @@ -77537,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" }, @@ -77564,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{ @@ -77579,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, @@ -77598,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 @@ -77613,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 @@ -77628,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" }, @@ -77645,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 @@ -77655,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" }, @@ -77673,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" = ( @@ -77725,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, @@ -77736,8 +75119,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d2 = 2; @@ -77759,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; @@ -77817,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, @@ -77834,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, @@ -77844,8 +75223,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -77884,7 +75262,6 @@ }, /area/assembly/chargebay) "diu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Central Hallway South 2"; dir = 4 @@ -77921,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 @@ -77963,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 @@ -77979,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" }, @@ -77989,6 +75367,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -78005,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{ @@ -78014,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" }, @@ -78043,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; @@ -78109,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; @@ -78199,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, @@ -78216,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, @@ -78234,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, @@ -78264,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{ @@ -78283,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{ @@ -78313,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 @@ -78331,8 +75709,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -78358,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{ @@ -78514,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; @@ -78548,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 @@ -78569,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 @@ -78590,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; @@ -78630,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 @@ -78650,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; @@ -78674,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" }, @@ -78703,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"; @@ -78779,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" }, @@ -78788,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" }, @@ -78799,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" }, @@ -78819,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" }, @@ -78861,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" }, @@ -78946,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, @@ -78982,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" @@ -79051,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" @@ -79062,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) @@ -79074,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" @@ -79103,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) @@ -79115,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{ @@ -79131,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" @@ -79149,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{ @@ -79175,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; @@ -79201,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" }, @@ -79218,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; @@ -79229,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 }, @@ -79306,7 +76686,6 @@ }, /area/medical/medbay) "dle" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -79401,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" }, @@ -79453,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 @@ -79481,7 +76860,6 @@ /turf/simulated/wall, /area/medical/surgery) "dlA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -79489,6 +76867,7 @@ dir = 10; initialize_directions = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -79501,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{ @@ -79520,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" @@ -79532,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, @@ -79555,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{ @@ -79593,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) @@ -79611,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; @@ -79625,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; @@ -79643,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" @@ -79655,6 +77038,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79663,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" @@ -79697,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" @@ -79708,8 +77087,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -79751,7 +77129,6 @@ /turf/simulated/floor/greengrid, /area/assembly/chargebay) "dmh" = ( -/obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -79886,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" }, @@ -79914,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{ @@ -79992,8 +77368,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -80023,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, @@ -80103,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{ @@ -80114,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 @@ -80158,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" @@ -80205,8 +77601,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -80224,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; @@ -80239,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" @@ -80269,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, @@ -80307,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) @@ -80315,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{ @@ -80403,6 +77788,7 @@ name = "Genetics"; req_access_txt = "9" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -80507,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; @@ -80557,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 @@ -80592,7 +77975,6 @@ }, /area/medical/surgeryobs) "doi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 @@ -80605,6 +77987,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80646,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 @@ -80755,8 +78137,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -80788,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" @@ -80820,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" @@ -80852,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, @@ -80865,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; @@ -80877,8 +78258,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -80900,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" @@ -80929,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 @@ -80956,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" @@ -80980,7 +78362,6 @@ /turf/simulated/floor/greengrid, /area/assembly/chargebay) "doY" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -80995,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" }, @@ -81026,9 +78402,6 @@ }, /area/assembly/chargebay) "dpd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -81038,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 @@ -81114,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" }, @@ -81134,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; @@ -81155,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" }, @@ -81163,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 @@ -81172,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" }, @@ -81183,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 @@ -81192,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" }, @@ -81200,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 @@ -81224,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 @@ -81243,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; @@ -81255,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" @@ -81266,8 +78638,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -81277,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"; @@ -81290,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" }, @@ -81298,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; @@ -81310,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" @@ -81349,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" }, @@ -81359,7 +78738,6 @@ }, /area/medical/surgeryobs) "dpI" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -81367,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" }, @@ -81434,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, @@ -81505,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; @@ -81628,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, @@ -81674,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{ @@ -81701,8 +79085,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -81712,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"; @@ -81724,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 }, @@ -81744,9 +79120,6 @@ }, /area/medical/genetics) "dqz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -81755,9 +79128,6 @@ }, /area/medical/genetics) "dqA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Geneticist" @@ -81768,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 }, @@ -81802,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" }, @@ -81830,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; @@ -81927,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 @@ -81983,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, @@ -82050,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" @@ -82067,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" @@ -82105,8 +79469,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -82165,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 @@ -82201,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, @@ -82227,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) @@ -82262,7 +79620,6 @@ }, /area/hallway/primary/aft) "drL" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sign/science{ pixel_x = -32; pixel_y = 32 @@ -82273,7 +79630,6 @@ }, /area/hallway/primary/aft) "drM" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sign/science{ pixel_x = 32; pixel_y = 32 @@ -82286,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" }, @@ -82310,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" @@ -82369,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{ @@ -82416,6 +79764,7 @@ name = "kitty basket" }, /mob/living/simple_animal/pet/cat/Runtime, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82424,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{ @@ -82446,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{ @@ -82494,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 @@ -82509,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, @@ -82561,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; @@ -82570,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{ @@ -82591,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{ @@ -82607,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 @@ -82639,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, @@ -82650,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" @@ -82683,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{ @@ -82696,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{ @@ -82798,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; @@ -82839,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"; @@ -82872,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" @@ -82912,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{ @@ -82946,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" = ( @@ -82973,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, @@ -82995,8 +80316,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -83018,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, @@ -83054,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; @@ -83083,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; @@ -83092,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" @@ -83101,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" @@ -83139,8 +80456,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; @@ -83158,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) @@ -83167,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{ @@ -83185,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; @@ -83197,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 @@ -83240,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, @@ -83251,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 @@ -83293,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, @@ -83351,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) @@ -83372,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, @@ -83426,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" @@ -83447,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{ @@ -83547,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" }, @@ -83570,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{ @@ -83579,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" = ( @@ -83608,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; @@ -83747,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; @@ -83793,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; @@ -83814,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, @@ -83913,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, @@ -83956,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" @@ -83990,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" }, @@ -84008,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, @@ -84018,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, @@ -84086,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{ @@ -84157,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" = ( @@ -84195,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, @@ -84283,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" @@ -84323,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, @@ -84332,6 +81595,7 @@ /area/maintenance/port) "dvX" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -84406,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{ @@ -84417,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" @@ -84537,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, @@ -84564,7 +81826,6 @@ }, /area/hallway/primary/aft) "dwu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Central Hallway South 3"; dir = 8 @@ -84588,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{ @@ -84632,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" = ( @@ -84740,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, @@ -84792,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{ @@ -84806,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, @@ -84950,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, @@ -85060,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 @@ -85080,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 @@ -85094,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"; @@ -85110,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; @@ -85122,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" }, @@ -85141,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"; @@ -85168,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 @@ -85184,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" }, @@ -85192,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{ @@ -85202,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" = ( @@ -85216,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" @@ -85227,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{ @@ -85242,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" @@ -85259,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 @@ -85268,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" @@ -85277,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 @@ -85286,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" @@ -85302,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" @@ -85318,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 @@ -85327,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" }, @@ -85346,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 @@ -85355,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 @@ -85374,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 @@ -85390,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; @@ -85414,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" @@ -85429,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, @@ -85470,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; @@ -85486,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" }, @@ -85512,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, @@ -85535,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) @@ -85585,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, @@ -85657,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" @@ -85676,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 @@ -85695,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, @@ -85723,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{ @@ -85757,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, @@ -85807,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" }, @@ -85831,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" = ( @@ -85875,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" @@ -85889,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{ @@ -85926,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, @@ -85944,9 +83199,6 @@ /turf/simulated/floor/plasteel, /area/medical/morgue) "dzi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -85958,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) @@ -86002,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" }, @@ -86031,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{ @@ -86103,8 +83355,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -86140,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"; @@ -86160,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 @@ -86178,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; @@ -86215,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 @@ -86237,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, @@ -86256,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 @@ -86307,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{ @@ -86325,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{ @@ -86345,8 +83587,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -86441,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" }, @@ -86462,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" @@ -86476,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" }, @@ -86484,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" = ( @@ -86607,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, @@ -86618,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 @@ -86634,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" }, @@ -86678,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; @@ -86694,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 @@ -86719,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" }, @@ -86740,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; @@ -86763,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{ @@ -86798,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{ @@ -86830,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, @@ -86847,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, @@ -86912,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; @@ -86949,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{ @@ -86960,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, @@ -86975,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{ @@ -86988,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{ @@ -87095,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{ @@ -87110,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 @@ -87121,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" }, @@ -87136,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, @@ -87148,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, @@ -87169,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{ @@ -87182,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" }, @@ -87239,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{ @@ -87285,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, @@ -87295,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, @@ -87319,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, @@ -87330,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" }, @@ -87357,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; @@ -87367,6 +84571,9 @@ opacity = 1; req_access_txt = "6" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87375,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 @@ -87391,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) @@ -87400,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, @@ -87410,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) @@ -87425,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{ @@ -87438,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, @@ -87448,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) @@ -87461,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{ @@ -87474,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; @@ -87486,8 +84683,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -87502,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 @@ -87524,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, @@ -87661,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" = ( @@ -87688,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, @@ -87700,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, @@ -87795,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 @@ -87810,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 @@ -87832,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 @@ -87875,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 @@ -87901,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" }, @@ -88028,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 @@ -88079,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 @@ -88094,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 @@ -88110,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 @@ -88138,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, @@ -88157,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 @@ -88175,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 @@ -88191,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 @@ -88209,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 @@ -88224,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 @@ -88270,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, @@ -88280,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, @@ -88335,8 +85513,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -88349,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) @@ -88358,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; @@ -88375,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) @@ -88384,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; @@ -88412,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" }, @@ -88504,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, @@ -88589,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 @@ -88622,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; @@ -88669,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{ @@ -88749,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" = ( @@ -88784,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" @@ -88823,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, @@ -88871,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" = ( @@ -88993,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) @@ -89105,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; @@ -89133,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" = ( @@ -89150,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" }, @@ -89158,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" = ( @@ -89214,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 @@ -89252,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{ @@ -89307,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{ @@ -89387,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; @@ -89470,7 +86638,6 @@ }, /area/assembly/robotics) "dGU" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -89494,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; @@ -89529,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"; @@ -89555,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"; @@ -89578,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 @@ -89604,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) @@ -89619,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; @@ -89633,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; @@ -89645,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, @@ -89703,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, @@ -89746,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, @@ -89799,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{ @@ -89821,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 @@ -89846,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 @@ -89861,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 @@ -89878,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 @@ -89894,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; @@ -89920,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 @@ -89938,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 @@ -89956,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 @@ -89976,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; @@ -89988,6 +87129,7 @@ dir = 4; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dHN" = ( @@ -90021,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" = ( @@ -90048,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 @@ -90107,8 +87251,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -90134,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" @@ -90160,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; @@ -90185,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 @@ -90203,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"; @@ -90222,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 @@ -90245,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 @@ -90273,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{ @@ -90294,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{ @@ -90336,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" @@ -90354,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" = ( @@ -90368,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, @@ -90397,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"; @@ -90432,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{ @@ -90448,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; @@ -90468,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 @@ -90484,8 +87618,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -90495,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 @@ -90512,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{ @@ -90554,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" @@ -90601,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; @@ -90613,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" @@ -90707,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" = ( @@ -90720,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" = ( @@ -90795,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, @@ -90832,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{ @@ -90864,8 +87995,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -90972,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, @@ -91009,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, @@ -91027,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; @@ -91049,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; @@ -91082,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) @@ -91096,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) @@ -91162,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, @@ -91190,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, @@ -91200,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" }, @@ -91227,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" @@ -91251,6 +88370,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91259,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{ @@ -91284,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"; @@ -91301,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, @@ -91328,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{ @@ -91369,8 +88484,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -91463,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; @@ -91495,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" @@ -91527,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; @@ -91554,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" }, @@ -91574,9 +88685,6 @@ }, /area/chapel/main) "dLz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -91585,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; @@ -91625,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; @@ -91637,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; @@ -91649,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, @@ -91667,8 +88777,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -91697,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; @@ -91713,6 +88821,7 @@ /obj/machinery/holosign/surgery{ id = "surgery2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91740,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{ @@ -91763,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; @@ -91791,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, @@ -91882,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 }, @@ -91895,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 }, @@ -91927,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; @@ -91936,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; @@ -91954,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; @@ -91963,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 @@ -91978,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; @@ -92000,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 @@ -92009,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" @@ -92018,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, @@ -92032,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; @@ -92063,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 @@ -92083,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; @@ -92112,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" }, @@ -92147,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, @@ -92191,8 +89273,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -92239,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" @@ -92299,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, @@ -92322,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" @@ -92353,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; @@ -92386,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, @@ -92428,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, @@ -92442,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, @@ -92461,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, @@ -92495,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 @@ -92522,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" @@ -92606,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{ @@ -92631,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{ @@ -92652,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; @@ -92667,6 +89731,7 @@ dir = 8; initialize_directions = 11 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92675,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 @@ -92693,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"; @@ -92712,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 @@ -92736,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 @@ -92753,8 +89813,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -92774,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; @@ -92792,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, @@ -92826,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{ @@ -92842,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"; @@ -92930,7 +89984,7 @@ d1 = 1; d2 = 4; icon_state = "1-4"; - tag = "90Curve" + tag = null }, /turf/simulated/floor/plating, /area/medical/virology) @@ -92964,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" }, @@ -92981,8 +90034,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/sink{ dir = 8; @@ -93024,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, @@ -93059,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) @@ -93099,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; @@ -93111,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; @@ -93169,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, @@ -93187,6 +90233,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -93207,7 +90254,6 @@ }, /area/medical/virology) "dPn" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -93215,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" }, @@ -93239,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{ @@ -93252,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, @@ -93262,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 @@ -93303,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 @@ -93318,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 @@ -93336,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{ @@ -93355,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; @@ -93377,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{ @@ -93402,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 @@ -93448,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 @@ -93502,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" = ( @@ -93577,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 @@ -93589,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" @@ -93621,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{ @@ -93648,8 +90689,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 4 @@ -93722,7 +90762,6 @@ }, /area/assembly/robotics) "dQr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -93732,6 +90771,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -93740,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, @@ -93766,8 +90805,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -93777,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, @@ -93788,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{ @@ -93804,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" @@ -93903,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, @@ -93944,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; @@ -93961,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; @@ -94006,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; @@ -94033,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 @@ -94085,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{ @@ -94145,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"; @@ -94159,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"; @@ -94176,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, @@ -94201,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" @@ -94232,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, @@ -94323,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, @@ -94361,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" }, @@ -94388,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, @@ -94461,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"; @@ -94487,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" }, @@ -94545,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, @@ -94558,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, @@ -94579,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, @@ -94632,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" }, @@ -94640,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" }, @@ -94773,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, @@ -94783,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, @@ -94799,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, @@ -94819,6 +91833,7 @@ dir = 1; pixel_x = -28 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94836,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{ @@ -94853,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, @@ -94879,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" = ( @@ -94894,7 +91904,6 @@ }, /area/hallway/secondary/exit) "dSV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; pixel_x = -24 @@ -94913,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, @@ -94928,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, @@ -94947,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"; @@ -94961,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" }, @@ -94978,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, @@ -94997,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"; @@ -95103,10 +92101,6 @@ }, /area/chapel/office) "dTr" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /obj/machinery/light/small{ dir = 1 }, @@ -95114,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" @@ -95146,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; @@ -95166,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, @@ -95183,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"; @@ -95237,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) @@ -95280,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" @@ -95403,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, @@ -95422,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, @@ -95434,7 +92401,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dUk" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -95454,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, @@ -95576,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; @@ -95762,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{ @@ -95818,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 @@ -95862,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, @@ -95876,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; @@ -95889,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, @@ -95910,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, @@ -95937,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{ @@ -96003,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, @@ -96016,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{ @@ -96036,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" }, @@ -96057,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{ @@ -96069,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{ @@ -96091,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, @@ -96101,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"; @@ -96111,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" }, @@ -96125,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; @@ -96158,8 +93073,6 @@ }, /area/toxins/xenobiology) "dWs" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /obj/structure/window/reinforced{ dir = 4 }, @@ -96168,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" }, @@ -96226,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 @@ -96240,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 @@ -96313,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" @@ -96322,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" = ( @@ -96342,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" @@ -96396,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{ @@ -96449,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{ @@ -96510,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" = ( @@ -96546,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 @@ -96564,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" = ( @@ -96592,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" @@ -96612,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{ @@ -96702,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" }, @@ -96814,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" @@ -96993,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 @@ -97029,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 }, @@ -97091,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, @@ -97107,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, @@ -97159,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; @@ -97243,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, @@ -97259,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; @@ -97288,8 +94163,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -97308,8 +94182,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -97377,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; @@ -97480,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 @@ -97549,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 @@ -97578,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" @@ -97599,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 @@ -97651,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) @@ -97661,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 @@ -97681,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, @@ -97689,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, @@ -97699,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" @@ -97720,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" @@ -97735,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, @@ -97756,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; @@ -97819,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"; @@ -97868,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, @@ -97886,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 @@ -97919,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{ @@ -97936,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, @@ -98015,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, @@ -98052,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" }, @@ -98080,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 }, @@ -98100,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" @@ -98118,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{ @@ -98149,9 +95082,6 @@ }, /area/security/processing) "gxd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, @@ -98186,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) @@ -98222,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" = ( @@ -98301,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) @@ -98315,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) @@ -98390,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) @@ -98399,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, @@ -98409,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 @@ -98446,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{ @@ -98482,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" @@ -98553,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 @@ -98564,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 @@ -98603,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) @@ -98616,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" }, @@ -98636,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, @@ -98644,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 @@ -98671,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) @@ -98688,9 +95652,6 @@ }, /area/maintenance/starboard) "iDa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door_control{ id = "magistrate"; name = "Privacy Shutters Control"; @@ -98698,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; @@ -98722,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; @@ -98741,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"; @@ -98765,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, @@ -98780,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, @@ -98798,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; @@ -98811,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; @@ -98834,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"; @@ -98848,8 +95859,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -98857,6 +95867,9 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98868,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" }, @@ -98885,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; @@ -98925,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 @@ -98946,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) @@ -98955,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) @@ -98977,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 @@ -98998,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{ @@ -99014,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" = ( @@ -99053,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, @@ -99061,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; @@ -99080,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, @@ -99120,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{ @@ -99162,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; @@ -99183,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 @@ -99202,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" }, @@ -99213,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, @@ -99238,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; @@ -99269,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 @@ -99327,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 @@ -99343,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" = ( @@ -99397,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; @@ -99406,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{ @@ -99447,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{ @@ -99475,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, @@ -99488,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 @@ -99532,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; @@ -99563,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{ @@ -99577,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 @@ -99592,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{ @@ -99604,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 @@ -99641,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; @@ -99682,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{ @@ -99695,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) @@ -99705,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, @@ -99734,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; @@ -99778,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 @@ -99803,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"; @@ -99821,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; @@ -99838,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, @@ -99850,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 @@ -99891,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; @@ -99914,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{ @@ -99931,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" }, @@ -99952,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, @@ -99973,8 +97109,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/chair{ dir = 1 @@ -100000,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 @@ -100056,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, @@ -100066,7 +97204,6 @@ }, /area/security/permasolitary) "nQq" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atm{ pixel_x = 32 }, @@ -100089,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 @@ -100168,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) @@ -100185,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 @@ -100207,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{ @@ -100219,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 @@ -100233,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, @@ -100242,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{ @@ -100252,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) @@ -100270,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) @@ -100279,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, @@ -100302,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"; @@ -100325,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" = ( @@ -100337,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{ @@ -100349,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, @@ -100375,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" @@ -100414,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"; @@ -100446,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" @@ -100537,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; @@ -100581,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; @@ -100615,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; @@ -100647,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 @@ -100665,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" @@ -100683,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{ @@ -100700,8 +97885,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/closet/wardrobe/red, /turf/simulated/floor/plasteel{ @@ -100742,6 +97926,7 @@ dir = 8; network = list("SS13","Security") }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -100758,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; @@ -100806,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 @@ -100815,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; @@ -100824,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; @@ -100844,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 @@ -100895,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 @@ -100906,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" @@ -100926,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; @@ -100939,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{ @@ -100967,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; @@ -101009,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" @@ -101033,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"; @@ -101047,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) @@ -101069,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{ @@ -101082,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; @@ -101112,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{ @@ -101160,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" @@ -101180,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" @@ -101196,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 @@ -101219,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, @@ -101230,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 @@ -101244,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, @@ -101268,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, @@ -101309,8 +98596,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -101320,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" = ( @@ -101338,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{ @@ -101362,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 @@ -101391,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) @@ -101400,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{ @@ -101413,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" @@ -101455,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 @@ -101466,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 @@ -101481,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 @@ -101511,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{ @@ -101528,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" }, @@ -101636,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{ @@ -101651,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, @@ -101708,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, @@ -101752,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 @@ -101762,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."; @@ -101771,6 +99107,9 @@ network = list("Interrogation"); pixel_y = -30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -101779,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"; @@ -101810,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{ @@ -101829,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{ @@ -101839,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{ @@ -101896,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; @@ -101934,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 @@ -101951,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, @@ -101965,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, @@ -102001,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{ @@ -102059,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{ @@ -102143,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, @@ -102169,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, @@ -102208,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{ @@ -102230,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 @@ -102251,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" @@ -102292,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" }, @@ -102340,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, @@ -102351,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 @@ -102369,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" = ( @@ -102385,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, @@ -102403,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; @@ -102434,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) @@ -102468,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) @@ -102479,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, @@ -116548,7 +113983,7 @@ dyo dzv dAH dAH -dAH +mtx dAH dAH dFf @@ -119312,7 +116747,7 @@ abj abj abj abj -bYm +bUJ abj coi abj @@ -119569,7 +117004,7 @@ aaa aaa abj aaa -bYm +bUJ aaa csr aaa @@ -119826,7 +117261,7 @@ aaa aaa abj aaa -bYm +bUJ aaa csr aaa @@ -120083,7 +117518,7 @@ abj abj abj abj -bYm +bUJ abj coi abj @@ -120340,7 +117775,7 @@ aaa aaZ abj aaa -bYm +bUJ aaa csr aaa @@ -120597,7 +118032,7 @@ abj abi abj abj -bYm +bUJ aaa csr aaa @@ -120854,7 +118289,7 @@ aaa abj aaa aaa -bYm +bUJ abj coi abj @@ -121111,7 +118546,7 @@ abi abi abi abj -bYm +bUJ aaa csr aaa @@ -121368,7 +118803,7 @@ abj abj abi aaa -bYm +bUJ aaa csr aaa @@ -121625,7 +119060,7 @@ bwN abj abj abj -bYm +bUJ abj coi abj @@ -121882,7 +119317,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122139,7 +119574,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122396,7 +119831,7 @@ bwN abj abj abj -bYm +bUJ abj coi abj @@ -122653,7 +120088,7 @@ bwN abj abi aaa -bYm +bUJ aaa csr aaa @@ -122910,7 +120345,7 @@ bwN abj abj aaa -bYm +bUJ aaa csr aaa @@ -123166,7 +120601,7 @@ bGs bwN abj bVs -bYa +bXG bYJ abj csr @@ -127504,9 +124939,9 @@ aLn aML aOg aPH -aQZ -aSD -aUc +spS +iiY +veH aVI aXn aYD @@ -128826,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 @@ -131955,7 +129390,7 @@ djf djn ddi dng -dng +fjv dng ddi cYc @@ -132469,7 +129904,7 @@ dhL dkx dkE dlP -dnd +dng cPf ddi cQY @@ -132725,9 +130160,9 @@ dgf dhM djs dkF -dlP -dne -cPf +dng +dng +dng ddi cQY cXU @@ -132982,10 +130417,10 @@ dge dhR djt dkH -cKs -dnf -dER -ddi +dkI +dkI +dkI +dkI cYc dsr cHA @@ -133238,11 +130673,11 @@ dgc dgf dhT dju -dkH +dkI cKu -dng -dng -ddi +mIp +sMj +dkI cQY dhG cHA @@ -133495,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 @@ -133752,14 +131187,14 @@ dgc dgg dhQ djx -dkF -dng +dkI +rCe dnh doD -ddi -drp -dst -cly +dkI +dmq +dmq +rIK dst dvW dWn @@ -134009,13 +131444,13 @@ dgj dgk dhV djy -ddi -dng -dng -dng -ddi -dsq -cNh +dkI +mlR +nte +hgq +iDz +vXX +dmq dtP cNh dvX @@ -134267,9 +131702,9 @@ dds dTe djv dkI -dkI -dkI -dkI +esK +qWp +esK dkI dkI dkI @@ -134516,9 +131951,9 @@ cTM cVm cWT dto -cND +tke dbO -cPn +gqM cZx dgl dhW @@ -134782,7 +132217,7 @@ dhY dhD dkK dlS -cMD +dve dve dwe dCN @@ -135279,7 +132714,7 @@ cIO bQx cLU cNw -cOZ +cQP cVf cVf cSc @@ -135287,7 +132722,7 @@ cVf cWK cWV dvN -dau +cND dbP cPn cIW @@ -135790,9 +133225,9 @@ cDW cGr dmq dmq -cKr -cKr -cKr +dvf +dvf +dvf cPb cQJ cSh @@ -136047,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 @@ -136304,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 @@ -136565,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 @@ -136818,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 @@ -137075,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 @@ -137332,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 @@ -137589,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 @@ -137846,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 @@ -138103,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 @@ -138158,7 +135593,7 @@ dQl dQY dXI dJx -dSi +dij dSJ dTs dml @@ -138364,15 +135799,15 @@ cKw cMd cND cPn -aKA +mnG cSm cZt cTU -cVq +cMm cXb cZt -cKF -dbV +dZb +dbP cPn dfk dig @@ -138394,10 +135829,10 @@ dwi dwi cKr dCQ -dEP -dFr -dFr -dGc +cNI +cRe +cRe +cRi dJy dHE dID @@ -138615,10 +136050,10 @@ cDO csK cEL bqu -cHE -cIX +bIG +cIW cKx -cMe +cMm cMf cPo aKC @@ -138630,10 +136065,10 @@ cXc cYB daE dbW -cPn -cPn -dih -cPn +cGJ +cGJ +cIn +cIY djL dkV cPn @@ -138651,7 +136086,7 @@ dXv cRd cZt dCR -dFr +cPs dEP dOO dGc @@ -138872,13 +136307,13 @@ cEb csK cGY bqu -cHF -cIY -cKy +cHE +cIX cMe -cNE -cPr -cMm +xpu +xme +sjV +eOL cPn cKI cUZ @@ -138888,7 +136323,7 @@ cKI daF cvm ddA -cRe +daA cxD dii djM @@ -138900,15 +136335,15 @@ drN dyL dyL dyL -dkW +cMg cZH dxx -cNx +cMj dzT dbj dBh -dik -dFr +cNE +cPF dOO dFr dID @@ -138929,8 +136364,8 @@ dMm dPL dRz dRP -dSl -dSM +dTs +dSL dUg dUR dYT @@ -139130,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 @@ -139362,11 +136797,11 @@ bQH ciB bUR chi -bYs +cbT chi -bYs +cbT cnv -bYs +cbT chh ciD ckq @@ -139386,13 +136821,13 @@ cEr cEQ cIT bqu -bIG +cHG cIW cKz -cMi +cMm cNG cPr -cMm +ckH cRd cZx cVd @@ -139582,11 +137017,11 @@ aKq aFA aFA aOF -aPZ +hly aRA aRd aRA -aPZ +hly aIZ aYZ aYZ @@ -139643,13 +137078,13 @@ cEr cER cIT bqu -bIG +cHG cIW cKA -cMi +cMm cNG cPr -cMm +ckH cSp cTQ cVr @@ -139851,7 +137286,7 @@ aZa bdN bfj bgy -bhL +bdP aZh blm bmZ @@ -139903,10 +137338,10 @@ qZt exL cIZ cKB -cMj +muI cNH cPr -cMm +ckH cWL cTR cVe @@ -139934,7 +137369,7 @@ dzW dEn dEn duZ -dEy +cMk dCV dbC dbI @@ -140103,7 +137538,7 @@ aWj aLS aUj aOG -aTp +aOG bcx bdP bdQ @@ -140157,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 @@ -140201,8 +137636,8 @@ dfu dfu dIH dJC -dKo -dKo +cYk +cYk dLE dXJ dKo @@ -140379,7 +137814,7 @@ abj bwe bAx bCp -byW +bAB bFC bHk bJg @@ -140414,13 +137849,13 @@ cCK csK cET bqu -bIG +cHG cIW cKD cMm cNG cPr -cMm +ckH cRg cTR cVu @@ -140457,13 +137892,13 @@ dGh dGP dHN dHU -dQI -dKo -dKo -dLE -dXJ -dNa -dNa +cWb +cYk +cYk +daQ +dbR +dbV +ddw dNa dKo dKo @@ -140617,9 +138052,9 @@ aUJ aWh aUw aOG -aOG -aYZ +aTp bdR +bdP bgv bgB bhR @@ -140651,13 +138086,13 @@ bOZ cab cbW cdI -cfF +cfK chk ciF bYv aaa aaa -bHk +dER cpV cry csK @@ -140671,13 +138106,13 @@ csK csK cEU bqu -bKt -cIY -cKE -cMe +cHG +cJa +cKF +cMm cNJ cPt -cMe +ckI cSs cTT cVv @@ -140714,10 +138149,10 @@ dGl dGS dHT dII -dJD +cWH dKo dKo -dLE +dLG dXJ dNb dNN @@ -140928,7 +138363,7 @@ cCL cEe cEL bqu -bIG +cHG cJa cKF cMm @@ -140971,10 +138406,10 @@ dGl dGS dHT dIJ -dJD +cWH dKo dKo -dLE +dLG dXJ dNc dNO @@ -141169,12 +138604,12 @@ cfG chl ciH bYv -bHk -bHk -bHk +dER +dER +dER cpX crB -bHj +euc ctZ csN cxa @@ -141185,7 +138620,7 @@ cCM cEf cEL bqu -bIG +cHG cIW cKG cMm @@ -141229,10 +138664,10 @@ dGS dHQ dLD dST -dSZ -dSZ -dTK -dUU +dKo +dKo +dLG +dXJ dNb dNP dOw @@ -141442,7 +138877,7 @@ cyk gyY cEV cGz -bIG +cHG cIW cKH cMn @@ -141489,7 +138924,7 @@ dXC dKp dKp dLF -dVe +dXJ dOu dNQ dOx @@ -141676,10 +139111,10 @@ bMX bOT aaa bOZ -bOZ -bOZ -bOZ -bOZ +dne +dnf +cfK +drp bYv ciJ bYv @@ -141736,9 +139171,9 @@ dql dBH dCX dfu -dVw +dHT dcV -dGU +iIw dWL dWM dIK @@ -141746,7 +139181,7 @@ dQI dKo dKo dLG -dVe +dXJ dNb bGr dOw @@ -141932,11 +139367,11 @@ bQL bSJ bOT aaa -bYw +bOZ caf cca -cdM -cfJ +cfK +cfK chn cpT csW @@ -141978,7 +139413,7 @@ diu dnC doS dnC -dnD +dHT doY dft drL @@ -141993,9 +139428,9 @@ doY doY dDb dXj -dnD +dHT dcV -dGU +iIw dGU dHS dIH @@ -142140,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 @@ -142175,7 +139610,7 @@ btH aaa bwh bxr -byW +bAB bAy bCt bEg @@ -142189,7 +139624,7 @@ bQM bSK bOT abj -bYw +bOZ cag ccb cdN @@ -142198,15 +139633,15 @@ cho ciL cnx clT -cnx -cnx +dLT +dLT cqb crF csR cud cvF cxa -cBo +rUS czN cBq cCP @@ -142254,7 +139689,7 @@ dEZ dcj dWK dcS -dHT +cUv dXn dXn dXn @@ -142446,7 +139881,7 @@ bQL bSL bOT aaa -bYw +bOZ cah ccc cdO @@ -142472,12 +139907,12 @@ cFa cGB cHK dEm -cKL -cKL -cNP -cPz cRh -diw +cRh +cNP +cRh +cRh +cmn cTW cYC cXd @@ -142487,16 +139922,16 @@ daO cYC cYC dgw -diw -diw +cmn +cmn dle cJY dmh -dnE +dpa dpa dsI drM -dnE +dpa nQq cTW dwu @@ -142506,12 +139941,12 @@ dQr dBj dBQ dDd -dXj +cRc dnD dGo dGo -dcV -dnD +cTS +cVc dXm dSV dTi @@ -142733,7 +140168,7 @@ cJk cJg cNQ cPA -cRi +cJg cJk cTX cVD @@ -142984,12 +140419,12 @@ cBo eNm cFa bqu -cHN +cHK cJg cKM cMo cNR -cPL +cSA cRj cSx cTX @@ -142997,7 +140432,7 @@ cVE cXf cYD cXe -daQ +cVD dcl cVD dgD @@ -143225,12 +140660,12 @@ cfN chr ciP bYx -bHk -bHk -bHk +dER +dER +dER cqe crJ -bHj +euc cuh csN cxa @@ -143241,13 +140676,13 @@ cCS cEf cFa bqu -cHN +cHK cJg cKN cMq cNS -cRk -cRk +cMq +cMq cSy cTY cVF @@ -143271,7 +140706,7 @@ dsO duk cYN dww -dww +cMi dwz dAd dwB @@ -143498,7 +140933,7 @@ cCT cEe cFa bqu -cHN +cHK cJh cKO dea @@ -143741,7 +141176,7 @@ ciR bYx aaa aaa -bHk +dER cqg crP csV @@ -143755,7 +141190,7 @@ csV csV cEY bqu -cHN +cHK cJh cKO dea @@ -143768,7 +141203,7 @@ cVH cXh cYF dlW -cXg +ctb cXg ddN dgD @@ -143779,7 +141214,7 @@ dfv dfv dYc dYi -dYk +drX drX dsQ duk @@ -144012,12 +141447,12 @@ cCV csV cFa bqu -cHN +cHK cJg cKP dea cbr -cPF +dea cha cSB cUb @@ -144269,13 +141704,13 @@ cCW csV cEZ bqu -cHN +cHK cJg cKQ dea -cNS +bYQ cMq -cUn +ckJ cSA cTZ cZF @@ -144492,7 +141927,7 @@ bwf aos bCy bEl -bFP +bCL bHz bJl bLa @@ -144532,7 +141967,7 @@ cKR cMr cbr cPH -cUn +ckJ cSD cTY cVK @@ -144783,13 +142218,13 @@ dte csV cFa bqu -cHN +cHK cJg cKS dea -cNS +bYQ cMq -cUn +ckJ cSE cTX cXe @@ -145005,7 +142440,7 @@ abj bwf bAG bCl -byU +aZe bFQ bWX bJn @@ -145040,13 +142475,13 @@ cDa csV cFa bqu -cHN +cHK cJg cKT dea cbr dea -cUn +ckJ cRm cJg cVM @@ -145262,7 +142697,7 @@ aaa bwf bAt bCl -byU +aZe bFx bWX bJo @@ -145303,7 +142738,7 @@ cKU cMs cNV cPI -cUn +ckJ cSF cUc cVN @@ -145519,7 +142954,7 @@ aaa bwf aot bCA -bEk +bkf asz bHx bJp @@ -145560,7 +142995,7 @@ cKV dea cbH ceQ -cUn +ckS cSF cUd cUn @@ -145572,14 +143007,14 @@ dco cSA dfz dgM -diC +mZY dkb dlq dnM dpm dpm dqA -drX +cKE dsX duk dvz @@ -145776,7 +143211,7 @@ aaa bwf bAs bCB -bAs +boT bAs bHx bJq @@ -145836,7 +143271,7 @@ dta dnQ dpn dqB -drY +dpn dsY duk duk @@ -146033,7 +143468,7 @@ btH bwf bAr bCl -byU +aZe bFR bHx bJr @@ -146547,7 +143982,7 @@ bwm bza bEo bCC -bEo +bqv bEo bHA bwm @@ -146565,7 +144000,7 @@ bwm bwm bwm ciV -ckH +bwm bwm bwm coE @@ -146804,7 +144239,7 @@ btK bva bva bCD -bva +bsg bFM bHB bva @@ -146822,7 +144257,7 @@ bva bva bva bva -ckI +bva bva bva bSi @@ -147061,7 +144496,7 @@ bxz bzb bEq bCE -bEq +bub bHm bHC bEq @@ -147079,15 +144514,15 @@ pfp cfS cnw cnC -ckJ +bSF cme bSF jUC cqp crT -ctb +bEq cuo -rjr +bSF bSF cyA bSF @@ -147110,7 +144545,7 @@ cKV cKV cKV cKV -don +ctd cSF dil cSF @@ -147122,7 +144557,7 @@ cSF dps cSF dsc -dtd +cRm duk dvE dwF @@ -147351,10 +144786,10 @@ cxn cxn cxn cxn -bng +rHU cGF -bng -bng +iWE +pDD bng cYP cYP @@ -147599,9 +145034,9 @@ cvu coI cqq bYH -ctd +cEL cuu -bqv +bIX cxn cyB cAc @@ -147612,8 +145047,8 @@ cFd hos cmt bMD -cKZ -cYP +cLa +iIY cOa cPQ cRp @@ -147634,7 +145069,7 @@ dFE dmt dnU dpu -dqH +cKy dsd dul dur @@ -147856,9 +145291,9 @@ cax cax cax bYK -ctd +cEL cuu -bqv +bIX cxn cyC cAd @@ -147866,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 @@ -148115,7 +145550,7 @@ chC lEt ctf cus -bsg +bhX cxn cyD bBk @@ -148123,11 +145558,11 @@ cAc cyD cxn bEH -cGJ -boG -boG +jKp +tNq +klh cLb -cYP +cPQ cOc cPR cRr @@ -148370,9 +145805,9 @@ cay cax cqr bYK -ctj +cFa cuu -bqv +bIX cxn cxn cAe @@ -148381,8 +145816,8 @@ cxn cxn bng cGI -cJp -dfK +bng +bng bng cYP cYP @@ -148395,7 +145830,7 @@ cYP cJg cJg daZ -dcn +ctj ddU cKY diG @@ -148627,9 +146062,9 @@ ccq coK cqr bYH -ctj +cFa cuu -bqv +bIX cxn cyF bBu @@ -148637,7 +146072,7 @@ cEj cEj cEn cxn -cGJ +buF boG cJo bRw @@ -148649,10 +146084,10 @@ cKO cUj cKO cKO -cKO +sYw cZM -cKO -dqW +kjL +cwc cSA cJg dgS @@ -148909,7 +146344,7 @@ dbi dbi cZN dbi -dco +cFo dfE cKY cJg @@ -149111,7 +146546,7 @@ bng bng abj btL -bvg +btL bwv bxG bwv @@ -149143,7 +146578,7 @@ cqr bYH cnO cti -dWO +bSz cxn cyH cAh @@ -149166,7 +146601,7 @@ cKV cKV dci cMq -don +ctd cSA dgx cSA @@ -149398,9 +146833,9 @@ cnK coM cqt bYH -ctj +cFa cuu -ckH +bwm cxn czU bBu @@ -149655,9 +147090,9 @@ cnL coN cqt bYH -ctj +cFa cuu -ckH +bwm cxn czU bBu @@ -149712,7 +147147,7 @@ dIX abj dKA dNi -dLT +dTu dMx dNk dRh @@ -149912,7 +147347,7 @@ cnM coO cqt bYH -ctj +cFa cuu cvW cxn @@ -150169,9 +147604,9 @@ cnM coM cqt bYH -ctj +cFa cuu -ckH +bwm cxn cyJ cAf @@ -150426,7 +147861,7 @@ cnN coP cqu bYH -ctj +cFa cuv cvX cxn @@ -150483,7 +147918,7 @@ abj abj dFH dNY -dLT +dTu dMz dNn dWT @@ -150923,9 +148358,9 @@ bJz bLt bNt bPp -bRc -bTg -bVm +bFU +rOn +bVk bXj bYM caG @@ -150935,9 +148370,9 @@ cga chL bYM ckR -cmn +coX chG -coQ +cDn cqv crV ctl @@ -151191,7 +148626,7 @@ cen cgb chM bYM -ckS +bHH cmo cnP coR @@ -151456,7 +148891,7 @@ cqw crW ctn byo -cwc +crW crW cyM crW @@ -151713,7 +149148,7 @@ cqw crX cto cuy -cwc +crW cxr cyN crX @@ -151993,7 +149428,7 @@ cYZ cZW cUr cKV -dtC +dqW cSF cJg dhe @@ -152227,7 +149662,7 @@ cqy crY ctq cuA -cwc +crW cxt cyP crW @@ -152456,8 +149891,8 @@ bxJ vnm bno eSX -hZF -bEw +bFX +bFX bEr bFX bMc @@ -152470,7 +149905,7 @@ bTj bVg bXn bYP -bXW +bYm ccD cer cgf @@ -152713,8 +150148,8 @@ bvm bwy bxK bzg -bzg -bCL +bJF +bJF bJF bJF bHT @@ -152726,7 +150161,7 @@ meB bTk bVp bXB -bYQ +bYR caM ccE ces @@ -152741,7 +150176,7 @@ cqA crZ cts cuC -cwe +cxv cxv cyR cxv @@ -152971,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 @@ -153005,9 +150440,9 @@ cAm cYh cDp cvV -cFo +cFv cGS -cIe +cIk aFx cLn cbm @@ -153016,8 +150451,8 @@ cQd cRz cjF cUu -cWb -cWb +dyd +dyd cZd cZT dbq @@ -153272,7 +150707,7 @@ aFx aFx aFx cSX -cUv +dDE cXI dlz dlz @@ -153471,8 +150906,8 @@ bbo bcU bex bhc -blp -blp +uKI +bnq bka blT bno @@ -153509,7 +150944,7 @@ brS bgs coU cJn -ctc +bRc cqI brS cqI @@ -153524,12 +150959,12 @@ cGT cIg aFx cAq -cBW +iuU cOp aKh aFx cSY -cUv +dDE cXI cZb cZY @@ -153766,7 +151201,7 @@ gGu cnR gGu cqD -gGu +bTg khY cuF cqI @@ -153778,8 +151213,8 @@ aFv cEt bEY cGV -bKv -cEu +cIc +jHd cAq cAq cOq @@ -154246,7 +151681,7 @@ bhg biu bkd blV -bnp +boR boR bqQ bsI @@ -154284,12 +151719,12 @@ csd bqj ckW brS -aFx -aFx -aFx -aFx -aFx -aFx +oNd +oNd +oNd +oNd +oNd +oNd cFr cGW cIi @@ -154507,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 @@ -154541,15 +151976,15 @@ cse bgs cuG cjm -aFx -aKh +oNd +lah cAo cBW -cAq -aFx +fqy +nFX bEY cGV -bKv +cIc aFx cLp cMN @@ -154557,7 +151992,7 @@ cOr cQg aFx cTa -cUv +dDE dlz cZh dac @@ -154761,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 @@ -154785,7 +152220,7 @@ bXt bYW bNm bxQ -cez +mEG bxQ chR cju @@ -154798,14 +152233,14 @@ csf bgt cuH bqj -aFx +oNd cyW cAp -cAq -cAq +tXj +wtE cEu cFs -cGV +rkJ cIj cJy cLp @@ -154814,7 +152249,7 @@ cLp cQi aFx cSY -cUv +dDE dlz cZi daR @@ -155018,7 +152453,7 @@ bhh bwE blY bhh -uSJ +bhi bqT bsL buc @@ -155055,12 +152490,12 @@ brS bgs cuH cmq -aFx +oNd cyX -cAq +oHv cBX aKk -aFx +nFX cFv cGV cIk @@ -155071,7 +152506,7 @@ cLp cQh aFx cTb -cUA +dDD dlz cZj daS @@ -155275,7 +152710,7 @@ bix bmO blZ bnt -boT +blZ bqU bsL bkj @@ -155312,12 +152747,12 @@ csg bgs ckX cmr -aFx -aFx -aFx -aFx -aFx -aFx +oNd +oNd +oNd +oNd +oNd +oNd cFu cGV cIk @@ -155328,7 +152763,7 @@ aFx aFx aFx cjn -cUv +dDE dlz dlz dbr @@ -155547,7 +152982,7 @@ bGj bLB bJM bLF -bNE +bLF bPv bRl obL @@ -155585,7 +153020,7 @@ cyY cyY aFx cTc -cUA +dDD cqC cMH cMH @@ -155804,7 +153239,7 @@ bGk bLB bGp bLG -nkh +bLG bPw hTr gwZ @@ -156061,7 +153496,7 @@ bGl bLB bJN bLG -nkh +bLG bPx bRl bNG @@ -156605,7 +154040,7 @@ jHa ctx cFx cGX -cIn +cJz cJz cLs cMQ @@ -156830,8 +154265,8 @@ bBa bBa bBa bBa -bBa -bBa +bHU +bPy bPy bPz bRo @@ -156853,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 @@ -157086,7 +154521,7 @@ blX blX blX blX -mHf +blX tRM bLK bPA @@ -157343,7 +154778,7 @@ bBc bJL bEx bEx -kzg +bEA tFO bIe bEx @@ -158854,7 +156289,7 @@ aaa acF abj abj -aIO +aIg aNQ aPg aQJ @@ -158907,9 +156342,9 @@ aaa aaa aaa csj -ctC -ctC -ctC +cFK +cFK +cFK csj csj csj @@ -158926,7 +156361,7 @@ csj csj csj csj -cUN +cFK cWi cXP csj diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 37caea366cd..14b1bf2017f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -10167,10 +10167,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/disposalpipe/sortjunction{ dir = 4; icon_state = "pipe-j2s"; @@ -24101,7 +24097,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; - req_access_txt = "32" + req_one_access_txt = "32;70" }, /obj/structure/cable/yellow{ d1 = 4; @@ -27167,13 +27163,14 @@ }, /area/storage/tech) "bhK" = ( -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_y = 30 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/structure/closet/jcloset, +/obj/machinery/light_switch{ + pixel_x = 23 + }, /turf/simulated/floor/plasteel, /area/janitor) "bhL" = ( @@ -27719,8 +27716,7 @@ /area/hallway/primary/central) "biY" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/light_switch{ - pixel_x = 8; +/obj/structure/reagent_dispensers/spacecleanertank{ pixel_y = 30 }, /turf/simulated/floor/plasteel{ @@ -28622,7 +28618,7 @@ "bkL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 5 }, /turf/simulated/floor/plating, /area/janitor) @@ -28632,6 +28628,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -29563,13 +29562,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /mob/living/simple_animal/lizard{ name = "Wags-His-Tail"; real_name = "Wags-His-Tail" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -29583,9 +29582,6 @@ /obj/effect/landmark/start{ name = "Janitor" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -29736,14 +29732,12 @@ pixel_x = -24 }, /obj/structure/table, -/obj/item/clothing/gloves/color/orange, -/obj/item/storage/box/mousetraps, -/obj/item/storage/box/mousetraps, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, /obj/item/key/janitor, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -30496,6 +30490,8 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -30663,13 +30659,11 @@ "boN" = ( /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, -/obj/structure/table, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_x = -29 }, -/obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera{ c_tag = "Custodial Closet"; dir = 4 @@ -30677,9 +30671,12 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/structure/rack{ + dir = 1 }, +/obj/item/clothing/gloves/color/orange, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -31240,8 +31237,6 @@ dir = 4; pixel_x = 11 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -35707,7 +35702,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/sortjunction{ dir = 1; name = "Custodial Junction"; @@ -36147,7 +36141,7 @@ "byV" = ( /obj/machinery/door/airlock/maintenance{ name = "Engineering Foyer Maintenance"; - req_one_access_txt = "32;19" + req_one_access_txt = "32;19;70" }, /turf/simulated/floor/plating, /area/engine/break_room) @@ -49726,7 +49720,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/sortjunction{ dir = 1; icon_state = "pipe-j2s"; @@ -82361,14 +82354,6 @@ icon_state = "redfull" }, /area/security/main) -"vgQ" = ( -/obj/docking_port/stationary/whiteship{ - dir = 8; - id = "whiteship_cyberiad"; - name = "North of Cerebron" - }, -/turf/space, -/area/space) "vjp" = ( /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -136763,7 +136748,7 @@ aaa aaa aaa aaa -vgQ +aaa aaa aaa aaa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index f14c68812b4..11f658476d3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -3395,16 +3395,12 @@ /area/ruin/space/ancientstation/rnd) "hU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/particle_accelerator/control_box{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/machinery/particle_accelerator/control_box, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "hV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/particle_emitter/right{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/particle_emitter/right, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "hW" = ( @@ -4029,9 +4025,7 @@ /area/ruin/space/ancientstation/thetacorridor) "jm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/particle_emitter/center{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/particle_emitter/center, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "jn" = ( @@ -4747,23 +4741,17 @@ /area/ruin/space/ancientstation/thetacorridor) "kT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/particle_emitter/left{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/particle_emitter/left, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "kU" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/fuel_chamber{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/fuel_chamber, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "kV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/end_cap{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/end_cap, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "kW" = ( @@ -4785,9 +4773,7 @@ /area/ruin/space/ancientstation/rnd) "kY" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/particle_accelerator/power_box{ - icon = 'icons/obj/machines/particle_accelerator3.dmi' - }, +/obj/structure/particle_accelerator/power_box, /turf/simulated/floor/plating, /area/ruin/space/ancientstation/thetacorridor) "kZ" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 833ca217ea4..4d1213d1e65 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -6,6 +6,19 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) +"aac" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/table, +/obj/item/radio/electropack, +/obj/item/assembly/signaler, +/obj/item/healthanalyzer, +/obj/item/hand_labeler, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/misc_lab) "aaQ" = ( /obj/docking_port/stationary/whiteship{ dir = 8; @@ -64162,18 +64175,6 @@ }, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"cBZ" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/table, -/obj/item/radio/electropack, -/obj/item/assembly/signaler, -/obj/item/healthanalyzer, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/misc_lab) "cCa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -133926,7 +133927,7 @@ cuQ bGG cyR cAP -cBZ +aac cDw cDb cEt diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index fc67f448526..f399915e3e7 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -114,3 +114,12 @@ #define PIPE_COLOR_GREEN "#00ff00" #define PIPE_COLOR_YELLOW "#ffcc00" #define PIPE_COLOR_PURPLE "#5c1ec0" + +///Main colors for UI themes +#define COLOR_THEME_MIDNIGHT "#6086A0" +#define COLOR_THEME_PLASMAFIRE "#FFB200" +#define COLOR_THEME_RETRO "#24CA00" +#define COLOR_THEME_SLIMECORE "#4FB259" +#define COLOR_THEME_OPERATIVE "#B8221F" +#define COLOR_THEME_GLASS "#75A4C4" +#define COLOR_THEME_CLOCKWORK "#CFBA47" diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index a68646224cf..7e0941d3e65 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -103,6 +103,7 @@ #define PASSBLOB 8 #define PASSMOB 16 #define LETPASSTHROW 32 +#define PASSFENCE 64 //turf-only flags #define NOJAUNT 1 diff --git a/code/__DEFINES/footstep.dm b/code/__DEFINES/footstep.dm index 469549b8827..bda71aa4443 100644 --- a/code/__DEFINES/footstep.dm +++ b/code/__DEFINES/footstep.dm @@ -7,12 +7,14 @@ #define FOOTSTEP_WATER "water" #define FOOTSTEP_LAVA "lava" #define FOOTSTEP_MEAT "meat" +#define FOOTSTEP_GLASS "glass" //barefoot sounds #define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot" #define FOOTSTEP_WOOD_CLAW "woodclaw" #define FOOTSTEP_HARD_BAREFOOT "hardbarefoot" #define FOOTSTEP_HARD_CLAW "hardclaw" #define FOOTSTEP_CARPET_BAREFOOT "carpetbarefoot" +#define FOOTSTEP_GLASS_BAREFOOT "glassbarefoot" //misc footstep sounds #define FOOTSTEP_GENERIC_HEAVY "heavy" @@ -83,7 +85,11 @@ GLOBAL_LIST_INIT(footstep, list( 'sound/effects/footstep/lava2.ogg', 'sound/effects/footstep/lava3.ogg'), 100, 0), FOOTSTEP_MEAT = list(list( - 'sound/effects/meatslap.ogg'), 100, 0) + 'sound/effects/meatslap.ogg'), 100, 0), + FOOTSTEP_GLASS = list(list( + 'sound/effects/footstep/glass1.ogg', + 'sound/effects/footstep/glass2.ogg', + 'sound/effects/footstep/glass3.ogg'), 100, 1), )) //bare footsteps lists GLOBAL_LIST_INIT(barefootstep, list( @@ -127,6 +133,10 @@ GLOBAL_LIST_INIT(barefootstep, list( 'sound/effects/footstep/lava3.ogg'), 100, 0), FOOTSTEP_MEAT = list(list( 'sound/effects/meatslap.ogg'), 100, 0), + FOOTSTEP_GLASS_BAREFOOT = list(list( + 'sound/effects/footstep/glassbarefoot1.ogg', + 'sound/effects/footstep/glassbarefoot2.ogg', + 'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1), )) //claw footsteps lists @@ -171,6 +181,10 @@ GLOBAL_LIST_INIT(clawfootstep, list( 'sound/effects/footstep/lava3.ogg'), 100, 0), FOOTSTEP_MEAT = list(list( 'sound/effects/meatslap.ogg'), 100, 0), + FOOTSTEP_GLASS = list(list( + 'sound/effects/footstep/glassbarefoot1.ogg', + 'sound/effects/footstep/glassbarefoot2.ogg', + 'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1), )) //heavy footsteps list diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index f64022136ef..55701ed9166 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -74,7 +74,6 @@ //Species traits. #define NO_BLOOD "no_blood" -#define NOTRANSSTING "no_trans_sting" #define IS_WHITELISTED "whitelisted" #define LIPS "lips" #define EXOTIC_COLOR "exotic_blood_color" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 4950beb7e74..bff5100982a 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -26,11 +26,13 @@ #define DISPOSAL_PIPE_LAYER 2.3 #define GAS_PIPE_HIDDEN_LAYER 2.35 #define WIRE_LAYER 2.4 +#define TRANSPARENT_TURF_LAYER 2.41 #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 #define GAS_PIPE_VISIBLE_LAYER 2.47 #define GAS_FILTER_LAYER 2.48 #define GAS_PUMP_LAYER 2.49 +#define HOLOPAD_LAYER 2.491 #define CONVEYOR_LAYER 2.495 #define LOW_OBJ_LAYER 2.5 #define LOW_SIGIL_LAYER 2.52 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index ba292ab65f6..a198421a2cb 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -56,10 +56,11 @@ #define PREFTOGGLE_2_REVERB_DISABLE 512 #define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT 1024 #define PREFTOGGLE_2_SIMPLE_STAT_PANEL 2048 +#define PREFTOGGLE_2_SEE_ITEM_OUTLINES 4096 -#define TOGGLES_2_TOTAL 4095 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. +#define TOGGLES_2_TOTAL 8191 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. -#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE) +#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE|PREFTOGGLE_2_SEE_ITEM_OUTLINES) // Sanity checks #if TOGGLES_TOTAL > 16777215 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index e836824ad3a..0aa01605808 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -272,15 +272,19 @@ update_all_mob_security_hud() return 1 -/* -Proc for attack log creation, because really why not -1 argument is the actor -2 argument is the target of action -3 is the full description of the action -4 is whether or not to message admins -This is always put in the attack log. -*/ - +/** + * Creates attack (old and new) logs for the user and defense logs for the target. + * Will message admins depending on the custom_level, user and target. + * + * custom_level will determine the log level set. Unless the target is SSD and there is a user doing it + * If custom_level is not set then the log level will be determined using the user and the target. + * + * * Arguments: + * * user - The thing doing it. Can be null + * * target - The target of the attack + * * what_done - What has happened + * * custom_level - The log level override + */ /proc/add_attack_logs(atom/user, target, what_done, custom_level) if(islist(target)) // Multi-victim adding var/list/targets = target @@ -323,7 +327,7 @@ This is always put in the attack log. loglevel = ATKLOG_ALMOSTALL else loglevel = ATKLOG_ALL // Hitting an object. Not a mob - if(isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE. Overrides custom level + if(user && isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE. Overrides custom level loglevel = ATKLOG_FEW diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 5534c19cdd1..b92fb82f9af 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -164,6 +164,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" #define TRAIT_DWARF "dwarf" #define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent +#define TRAIT_MESON_VISION "meson_vision" +#define TRAIT_FLASH_PROTECTION "flash_protection" +#define TRAIT_NIGHT_VISION "night_vision" #define TRAIT_COMIC_SANS "comic_sans" #define TRAIT_NOFINGERPRINTS "no_fingerprints" diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 0e73437dd93..d418f30c78d 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -22,12 +22,12 @@ #define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE)))) //Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 513 -#define MIN_COMPILER_BUILD 1514 +#define MIN_COMPILER_VERSION 514 +#define MIN_COMPILER_BUILD 1554 #if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 513.1514 or higher +#error You need version 514.1554 or higher #endif // Macros that must exist before world.dm diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 1119ac364cc..2c49057e636 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -5,7 +5,6 @@ GLOBAL_VAR_INIT(deafblock, 0) GLOBAL_VAR_INIT(hulkblock, 0) GLOBAL_VAR_INIT(teleblock, 0) GLOBAL_VAR_INIT(fireblock, 0) -GLOBAL_VAR_INIT(xrayblock, 0) GLOBAL_VAR_INIT(clumsyblock, 0) GLOBAL_VAR_INIT(fakeblock, 0) GLOBAL_VAR_INIT(coughblock, 0) @@ -30,6 +29,9 @@ GLOBAL_VAR_INIT(hallucinationblock, 0) GLOBAL_VAR_INIT(noprintsblock, 0) GLOBAL_VAR_INIT(shockimmunityblock, 0) GLOBAL_VAR_INIT(smallsizeblock, 0) +GLOBAL_VAR_INIT(mesonblock, 0) +GLOBAL_VAR_INIT(noflashblock, 0) +GLOBAL_VAR_INIT(nightvisionblock, 0) /////////////////////////////// // Goon Stuff diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 39551da14b6..90840095938 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -46,6 +46,9 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DWARF" = TRAIT_DWARF, "TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS, "TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE, + "TRAIT_MESON_VISION" = TRAIT_MESON_VISION, + "TRAIT_FLASH_PROTECTION" = TRAIT_FLASH_PROTECTION, + "TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION, "TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS, "TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS, diff --git a/code/controllers/subsystem/metrics.dm b/code/controllers/subsystem/metrics.dm index 7ebaadfae77..95055f99216 100644 --- a/code/controllers/subsystem/metrics.dm +++ b/code/controllers/subsystem/metrics.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(metrics) var/list/out = list() out["@timestamp"] = time_stamp() // This is required by ElasticSearch, complete with this name. DO NOT REMOVE THIS. out["cpu"] = world.cpu - // out["maptick"] = world.map_cpu // TODO: 514 + out["maptick"] = world.map_cpu out["elapsed_processed"] = world.time out["elapsed_real"] = (REALTIMEOFDAY - world_init_time) out["client_count"] = length(GLOB.clients) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 14a952cb36f..28f69ba1795 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -287,7 +287,7 @@ SUBSYSTEM_DEF(ticker) else log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config") - SSnightshift.check_nightshift() + SSnightshift.check_nightshift(TRUE) #ifdef UNIT_TESTS RunUnitTests() diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index f4b8e84204f..2ea582aab62 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -49,6 +49,10 @@ var/mat_path = possible_mats[id] materials[id] = new mat_path() +/datum/component/material_container/Destroy(force, silent) + QDEL_LIST_ASSOC_VAL(materials) + return ..() + /datum/component/material_container/proc/OnExamine(datum/source, mob/user, list/examine_list) if(show_on_examine) for(var/I in materials) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 7c05f7806f9..6695297337d 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -6,6 +6,7 @@ var/list/steps var/atom/holder var/result + var/index var/list/steps_desc var/taskpath = null // Path of job objective completed. @@ -128,7 +129,6 @@ return TRUE /datum/construction/reversible - var/index /datum/construction/reversible/New(atom) ..() @@ -168,7 +168,6 @@ #define state_prev "prev" /datum/construction/reversible2 - var/index var/base_icon = "durand" /datum/construction/reversible2/New(atom) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index c48b518fa19..a70a81bb285 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -228,6 +228,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/item/vending_refill/security) containername = "SecTech supply crate" +/datum/supply_packs/security/vending/clothingvendor + name = "Security Clothing Vendors Crate" + cost = 40 + contains = list(/obj/item/vending_refill/secdrobe, + /obj/item/vending_refill/detdrobe) + containername = "security clothing vendor crate" + ////// Armor: Basic /datum/supply_packs/security/helmets @@ -578,6 +585,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/vending_refill/youtool) containername = "engineering supply crate" +/datum/supply_packs/engineering/vending/clothingvendor + name = "Engineering Clothing Vendors Crate" + cost = 20 + contains = list(/obj/item/vending_refill/engidrobe, + /obj/item/vending_refill/atmosdrobe) + containername = "engineering clothing vendor crate" + /datum/supply_packs/engineering/powergamermitts name = "Insulated Gloves Crate" contains = list(/obj/item/clothing/gloves/color/yellow, @@ -896,6 +910,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/vending_refill/wallmed) containername = "medical vending crate" +/datum/supply_packs/medical/vending/clothingvendor + name = "Medical Clothing Vendors Crate" + cost = 20 + contains = list(/obj/item/vending_refill/medidrobe, + /obj/item/vending_refill/chemdrobe, + /obj/item/vending_refill/virodrobe) + containername = "medical clothing vendors crate" + /datum/supply_packs/medical/bloodpacks name = "Blood Pack Variety Crate" contains = list(/obj/item/reagent_containers/iv_bag, @@ -1043,6 +1065,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containertype = /obj/structure/largecrate containername = "oil tank crate" +/datum/supply_packs/science/vending/clothingvendor + name = "Science Clothing Vendors Crate" + cost = 20 + contains = list(/obj/item/vending_refill/scidrobe, + /obj/item/vending_refill/robodrobe, + /obj/item/vending_refill/genedrobe,) + containername = "science clothing vendor crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Organic ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -1814,6 +1844,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY cost = 15 containername = "boxing supply crate" +/datum/supply_packs/misc/vending/clothingvendor + name = "Service Clothing Vendors Crate" + cost = 20 + contains = list(/obj/item/vending_refill/bardrobe, + /obj/item/vending_refill/chefdrobe, + /obj/item/vending_refill/hydrodrobe) + containername = "service clothing vendor crate" + +/datum/supply_packs/misc/vending/clothingvendor/cargo + name = "Cargo Clothing Vendors Crate" + cost = 20 + contains = list(/obj/item/vending_refill/cargodrobe) + containername = "cargo clothing vendor crate" + ///////////// Station Goals /datum/supply_packs/misc/station_goal diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index e8d3abb7335..301ed685d46 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -44,12 +44,13 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event title = "Security Announcement" announcement_type = "Security Announcement" -/datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language) +/datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language, new_sound2 = null) if(!message) return var/message_title = new_title ? new_title : title var/message_sound = new_sound ? sound(new_sound) : sound + var/message_sound2 = new_sound2 ? sound(new_sound2) : sound if(!msg_sanitized) message = trim_strip_html_properly(message, allow_lines = 1) @@ -74,6 +75,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event NewsCast(message, message_title) Sound(message_sound, combined_receivers[1] + combined_receivers[2]) + Sound(message_sound2, combined_receivers[1] + combined_receivers[2]) Log(message, message_title) /datum/announcement/proc/Get_Receivers(datum/language/message_language) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index b3ae451aa35..c9d650271e2 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -346,7 +346,7 @@ var/obj/machinery/firealarm/F = alarm F.update_fire_light(fire) for(var/obj/machinery/light/L in src) - L.update() + L.update(TRUE, TRUE, FALSE) /** * unset the fire alarm visual affects in an area @@ -360,7 +360,7 @@ var/obj/machinery/firealarm/F = alarm F.update_fire_light(fire) for(var/obj/machinery/light/L in src) - L.update() + L.update(TRUE, TRUE, FALSE) /area/proc/updateicon() var/weather_icon diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d8dd3bb44c8..e46086d9b2b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1153,3 +1153,15 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) if(degrees) appearance_flags |= PIXEL_SCALE transform = M + +/* + Setter for the `density` variable. + Arguments: + * new_value - the new density you would want it to set. + Returns: Either null if identical to existing density, or the new density if different. +*/ +/atom/proc/set_density(new_value) + if(density == new_value) + return + . = density + density = new_value diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 7e9b6c34634..5d1bb0c98b0 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -156,7 +156,7 @@ to_chat(usr, "[src] is already occupied!") return if(usr.abiotic()) - to_chat(usr, "Subject cannot have abiotic items on.") + to_chat(usr, "Subject may not hold anything in their hands.") return if(usr.has_buckled_mobs()) //mob attached to us to_chat(usr, "[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.") @@ -194,7 +194,7 @@ if(!istype(L) || L.buckled) return if(L.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return if(L.has_buckled_mobs()) //mob attached to us to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") @@ -232,7 +232,7 @@ to_chat(user, "The scanner is already occupied!") return if(G.affecting.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return if(G.affecting.has_buckled_mobs()) //mob attached to us to_chat(user, "[G] will not fit into [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.") diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm index bcb11eb1631..a03c686140a 100644 --- a/code/game/dna/mutations/disabilities.dm +++ b/code/game/dna/mutations/disabilities.dm @@ -140,12 +140,16 @@ /datum/mutation/disability/colourblindness/activate(mob/M) ..() M.update_client_colour() //Handle the activation of the colourblindness on the mob. - M.update_icons() //Apply eyeshine as needed. + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.update_misc_effects() /datum/mutation/disability/colourblindness/deactivate(mob/M) ..() M.update_client_colour() //Handle the deactivation of the colourblindness on the mob. - M.update_icons() //Remove eyeshine as needed. + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.update_misc_effects() /datum/mutation/disability/deaf name = "Deafness" diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm index 3d2f991acb6..20c37357c50 100644 --- a/code/game/dna/mutations/powers.dm +++ b/code/game/dna/mutations/powers.dm @@ -158,28 +158,6 @@ M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. to_chat(M, "You suddenly feel very weak.") -/datum/mutation/xray - name = "X-Ray Vision" - activation_messages = list("The walls suddenly disappear.") - deactivation_messages = list("The walls around you re-appear.") - instability = GENE_INSTABILITY_MAJOR - traits_to_add = list(TRAIT_XRAY_VISION) - activation_prob = 15 - -/datum/mutation/xray/New() - ..() - block = GLOB.xrayblock - -/datum/mutation/xray/activate(mob/living/M) - ..() - M.update_sight() - M.update_icons() //Apply eyeshine as needed. - -/datum/mutation/xray/deactivate(mob/living/M) - ..() - M.update_sight() - M.update_icons() //Remove eyeshine as needed. - /datum/mutation/tk name = "Telekenesis" activation_messages = list("You feel smarter.") @@ -1181,3 +1159,58 @@ else H.remoteview_target = null H.reset_perspective() + +/datum/mutation/meson_vision + name = "Meson Vision" + activation_messages = list("More information seems to reach your eyes...") + deactivation_messages = list("The amount of information reaching your eyes fades...") + instability = GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_MESON_VISION) + +/datum/mutation/meson_vision/New() + ..() + block = GLOB.mesonblock + +/datum/mutation/meson_vision/activate(mob/living/M) + ..() + M.update_sight() + +/datum/mutation/meson_vision/deactivate(mob/living/M) + ..() + M.update_sight() + +/datum/mutation/night_vision + name = "Night Vision" + activation_messages = list("Were the lights always that bright?") + deactivation_messages = list("The ambient light level returns to normal...") + instability = GENE_INSTABILITY_MODERATE + traits_to_add = list(TRAIT_NIGHT_VISION) + +/datum/mutation/night_vision/New() + ..() + block = GLOB.nightvisionblock + +/datum/mutation/night_vision/activate(mob/living/M) + ..() + M.update_sight() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.update_misc_effects() + +/datum/mutation/night_vision/deactivate(mob/living/M) + ..() + M.update_sight() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.update_misc_effects() + +/datum/mutation/flash_protection + name = "Flash Protection" + activation_messages = list("You stop noticing the glare from lights...") + deactivation_messages = list("Lights begin glaring again...") + instability = GENE_INSTABILITY_MINOR + traits_to_add = list(TRAIT_FLASH_PROTECTION) + +/datum/mutation/flash_protection/New() + ..() + block = GLOB.noflashblock diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index e5da77c8196..02022121209 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -66,10 +66,10 @@ return if(src.client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot send IC messages (muted).") return - if(src.client.handle_spam_prevention(message,MUTE_IC)) + if(src.client.handle_spam_prevention(message, MUTE_IC)) return if(stat) diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm index ef22de10ce4..5d442caf60c 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine.dm @@ -10,20 +10,19 @@ //Recover from stuns. /datum/action/changeling/epinephrine/sting_action(mob/living/user) - if(user.lying) to_chat(user, "We arise.") else to_chat(user, "Adrenaline rushes through us.") user.SetSleeping(0) - user.stat = 0 + user.WakeUp() user.SetParalysis(0) user.SetStunned(0) user.SetWeakened(0) - user.lying = 0 + user.lying = FALSE user.update_canmove() user.reagents.add_reagent("synaptizine", 20) user.adjustStaminaLoss(-75) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) - return 1 + return TRUE diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 14d93439510..09702c97d3c 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -66,60 +66,6 @@ add_attack_logs(user, target, "Unsuccessful sting (changeling)") return 1 -/datum/action/changeling/sting/transformation - name = "Transformation Sting" - desc = "We silently sting a human, injecting a retrovirus that forces them to transform. Costs 50 chemicals." - helptext = "The victim will transform much like a changeling would. The effects will be obvious to the victim, and the process will damage our genomes." - button_icon_state = "sting_transform" - sting_icon = "sting_transform" - chemical_cost = 50 - dna_cost = 3 - genetic_damage = 100 - var/datum/dna/selected_dna = null - -/datum/action/changeling/sting/transformation/Trigger() - var/mob/user = usr - var/datum/changeling/changeling = user.mind.changeling - if(changeling.chosen_sting) - unset_sting(user) - return - selected_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") - if(!selected_dna) - return - if((NOTRANSSTING in selected_dna.species.species_traits) || selected_dna.species.is_small) - to_chat(user, "The selected DNA is incompatible with our sting.") - return - ..() - -/datum/action/changeling/sting/transformation/can_sting(mob/user, mob/target) - if(!..()) - return - if(HAS_TRAIT(target, TRAIT_HUSK) || !ishuman(target) || (NOTRANSSTING in target.dna.species.species_traits)) - to_chat(user, "Our sting appears ineffective against its DNA.") - return FALSE - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(HAS_TRAIT(H, TRAIT_GENELESS)) - to_chat(user, "This won't work on a creature without DNA.") - return FALSE - return TRUE - -/datum/action/changeling/sting/transformation/sting_action(mob/user, mob/target) - add_attack_logs(user, target, "Transformation sting (changeling) (new identity is [selected_dna.real_name])") - if(issmall(target)) - to_chat(user, "Our genes cry out as we sting [target.name]!") - - if(iscarbon(target) && (target.status_flags & CANWEAKEN)) - var/mob/living/carbon/C = target - C.do_jitter_animation(500) - - target.visible_message("[target] begins to violenty convulse!","You feel a tiny prick and a begin to uncontrollably convulse!") - - spawn(10) - transform_dna(target,selected_dna)//target is always human so no problem here - SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) - return TRUE - /datum/action/changeling/sting/extract_dna name = "Extract DNA Sting" desc = "We stealthily sting a target and extract their DNA. Costs 25 chemicals." diff --git a/code/game/gamemodes/cult/cult_datums.dm b/code/game/gamemodes/cult/cult_datums.dm index 67e9a78d879..fbbee18a94b 100644 --- a/code/game/gamemodes/cult/cult_datums.dm +++ b/code/game/gamemodes/cult/cult_datums.dm @@ -73,6 +73,9 @@ var/airlock_unruned_icon_file = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' var/airlock_unruned_overlays_file = 'icons/obj/doors/airlocks/cult/unruned/cult-overlays.dmi' + /// Are cultist mirror shields active yet? + var/mirror_shields_active = FALSE + /datum/cult_info/fire name = "Cult of Kha'Rin" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 8a051fe8843..c7ab2bb937f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -444,6 +444,11 @@ * The illusion has a 60% chance to be hostile and attack non-cultists, and a 40% chance to just run away from the user. */ /obj/item/shield/mirror/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + // Incase they get one by some magic + if(!SSticker.cultdat.mirror_shields_active) + to_chat(owner, "This shield is powerless! You must perform the required sacrifice to empower it!") + return + if(iscultist(owner) && !owner.holy_check()) // Cultist holding the shield // Hit by a projectile diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 9c3ad248ebe..5b24ad3c530 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -86,8 +86,10 @@ to_chat(user, "The magic in [src] is weak, it will be ready to use again in [get_ETA()].") return - var/choice = show_radial_menu(user, src, choosable_items, require_near = TRUE) - var/picked_type = choosable_items[choice] + + var/list/pickable_items = get_choosable_items() + var/choice = show_radial_menu(user, src, pickable_items, require_near = TRUE) + var/picked_type = pickable_items[choice] if(!QDELETED(src) && picked_type && Adjacent(user) && !user.incapacitated() && cooldowntime <= world.time) cooldowntime = world.time + creation_delay var/obj/O = new picked_type @@ -95,6 +97,14 @@ O.forceMove(get_turf(src)) to_chat(user, replacetext("[creation_message]", "%ITEM%", "[O.name]")) +/** + * Returns the items the cult can craft from this forge. + * + * Override on children for logic regarding game state. + */ +/obj/structure/cult/functional/proc/get_choosable_items() + return choosable_items.Copy() // Copied incase its modified on children + /** * Returns the cooldown time in minutes and seconds */ @@ -159,8 +169,15 @@ selection_prompt = "You study the schematics etched on the forge..." selection_title = "Forge" creation_message = "You work the forge as dark knowledge guides your hands, creating a %ITEM%!" - choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe, - "Mirror Shield" = /obj/item/shield/mirror) + choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe) + +/obj/structure/cult/functional/forge/get_choosable_items() + . = ..() + if(SSticker.cultdat.mirror_shields_active) + // Both lines here are needed. If you do it without, youll get issues. + . += "Mirror Shield" + .["Mirror Shield"] = /obj/item/shield/mirror + /obj/structure/cult/functional/forge/Initialize(mapload) . = ..() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 1f03e634a8c..4a9234ac49f 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -384,6 +384,9 @@ structure_check() searches for nearby cultist structures required for the invoca for(var/M in invokers) if(sacrifice_fulfilled) to_chat(M, "\"Yes! This is the one I desire! You have done well.\"") + if(!SSticker.cultdat.mirror_shields_active) // Only show once + to_chat(M, "You are now able to construct mirror shields inside the daemon forge.") + SSticker.cultdat.mirror_shields_active = TRUE else if(ishuman(offering) && offering.mind.offstation_role && offering.mind.special_role != SPECIAL_ROLE_ERT) //If you try it on a ghost role, you get nothing to_chat(M, "\"This soul is of no use to either of us.\"") diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 4e5372ffc2d..7411622d358 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -1,3 +1,6 @@ +#define NUKE_INTACT 0 +#define NUKE_CORE_MISSING 1 +#define NUKE_MISSING 2 /* * GAMEMODES (by Rastaf0) * @@ -434,6 +437,15 @@ nukecode = bomb.r_code return nukecode +/proc/get_nuke_status() + var/nuke_status = NUKE_MISSING + for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) + if(is_station_level(bomb.z)) + nuke_status = NUKE_CORE_MISSING + if(bomb.core) + nuke_status = NUKE_INTACT + return nuke_status + /datum/game_mode/proc/replace_jobbanned_player(mob/living/M, role_type) var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [role_type]?", role_type, FALSE, 10 SECONDS) var/mob/dead/observer/theghost = null @@ -534,3 +546,7 @@ var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_EVENTMISC] antaghud.leave_hud(mob_mind.current) set_antag_hud(mob_mind.current, null) + +#undef NUKE_INTACT +#undef NUKE_CORE_MISSING +#undef NUKE_MISSING diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index e299f0c97c2..4f0552cbefa 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -248,7 +248,7 @@ /datum/action/innate/ai/nuke_station/proc/set_us_up_the_bomb() to_chat(owner_AI, "Nuclear device armed.") - GLOB.event_announcement.Announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", new_sound = 'sound/AI/aimalf.ogg') + GLOB.event_announcement.Announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", 'sound/AI/aimalf.ogg') set_security_level("delta") owner_AI.nuking = TRUE var/obj/machinery/doomsday_device/DOOM = new /obj/machinery/doomsday_device(owner_AI) @@ -280,7 +280,7 @@ if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time - GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg') + GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/eshuttle_dock.ogg') return ..() /obj/machinery/doomsday_device/proc/start() @@ -300,7 +300,7 @@ if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time - GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg') + GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/eshuttle_dock.ogg') qdel(src) if(!timing) STOP_PROCESSING(SSfastprocess, src) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index b2f07c7e4e6..c39babad9f6 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -4,10 +4,10 @@ /mob/living/captive_brain/say(message) if(client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot speak in IC (muted).") return - if(client.handle_spam_prevention(message,MUTE_IC)) + if(client.handle_spam_prevention(message, MUTE_IC)) return if(istype(loc,/mob/living/simple_animal/borer)) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 93e385df6a9..39b883fed33 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -220,7 +220,7 @@ if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time - GLOB.command_announcement.Announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg') + GLOB.command_announcement.Announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/eshuttle_dock.ogg') return ..() if(finished != 0) return TRUE diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index d749f8ef553..7315b52b062 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -40,7 +40,6 @@ GLOB.hulkblock = getAssignedBlock("HULK", numsToAssign, DNA_HARD_BOUNDS, good=1) GLOB.teleblock = getAssignedBlock("TELE", numsToAssign, DNA_HARD_BOUNDS, good=1) GLOB.fireblock = getAssignedBlock("FIRE", numsToAssign, DNA_HARDER_BOUNDS, good=1) - GLOB.xrayblock = getAssignedBlock("XRAY", numsToAssign, DNA_HARDER_BOUNDS, good=1) GLOB.clumsyblock = getAssignedBlock("CLUMSY", numsToAssign) GLOB.fakeblock = getAssignedBlock("FAKE", numsToAssign) GLOB.coughblock = getAssignedBlock("COUGH", numsToAssign) @@ -49,6 +48,10 @@ GLOB.twitchblock = getAssignedBlock("TWITCH", numsToAssign) GLOB.nervousblock = getAssignedBlock("NERVOUS", numsToAssign) GLOB.wingdingsblock = getAssignedBlock("WINGDINGS", numsToAssign) + GLOB.mesonblock = getAssignedBlock("MESONS", numsToAssign, good=1) + GLOB.noflashblock = getAssignedBlock("NOFLASH", numsToAssign, DNA_HARDER_BOUNDS, good=1) + GLOB.nightvisionblock = getAssignedBlock("NIGHTVISION", numsToAssign, DNA_HARDER_BOUNDS, good=1) + // Bay muts GLOB.breathlessblock = getAssignedBlock("BREATHLESS", numsToAssign, DNA_HARD_BOUNDS, good=1) @@ -62,7 +65,6 @@ GLOB.noprintsblock = getAssignedBlock("NOPRINTS", numsToAssign, DNA_HARD_BOUNDS, good=1) GLOB.shockimmunityblock = getAssignedBlock("SHOCKIMMUNITY", numsToAssign, good=1) GLOB.smallsizeblock = getAssignedBlock("SMALLSIZE", numsToAssign, DNA_HARD_BOUNDS, good=1) - // // Goon muts ///////////////////////////////////////////// diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 77e775939fc..9814eb3ff2e 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -74,8 +74,8 @@ return 0 /datum/theft_objective/defib - name = "a compact defibrillator" - typepath = /obj/item/defibrillator/compact + name = "the chief medical officer's advanced compact defibrillator" + typepath = /obj/item/defibrillator/compact/advanced protected_jobs = list("Chief Medical Officer", "Paramedic") location_override = "the Chief Medical Officer's Office" diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 41612fb870b..4705c041775 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -4,7 +4,8 @@ name = "Bluespace Gigabeacon" desc = "A device that draws power from bluespace and creates a permanent tracking beacon." level = 1 // underfloor - layer = 2.5 + layer = WIRE_LAYER + plane = FLOOR_PLANE anchored = 1 use_power = IDLE_POWER_USE idle_power_usage = 0 @@ -26,7 +27,8 @@ Beacon.syndicate = syndicate Beacon.area_bypass = area_bypass Beacon.cc_beacon = cc_beacon - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) /obj/machinery/bluespace_beacon/proc/destroy_beacon() QDEL_NULL(Beacon) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 57062a6e806..1272a667baa 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -512,7 +512,7 @@ if(!istype(L) || L.buckled) return if(L.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return if(L.has_buckled_mobs()) //mob attached to us to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 9b16d52383c..52857a071dc 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -67,7 +67,7 @@ return var/mob/living/carbon/human/M = TYPECAST_YOUR_SHIT.affecting if(M.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return M.forceMove(src) occupant = M @@ -122,7 +122,7 @@ if(H.buckled) return FALSE if(H.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return FALSE if(H.has_buckled_mobs()) //mob attached to us to_chat(user, "[H] will not fit into [src] because [H.p_they()] [H.p_have()] a slime latched onto [H.p_their()] head.") diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e8d5cfcf437..79785006452 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -100,6 +100,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\ /obj/machinery/clonepod/Destroy() if(connected) connected.pods -= src + connected = null if(clonemind) UnregisterSignal(clonemind.current, COMSIG_LIVING_REVIVE) UnregisterSignal(clonemind, COMSIG_MIND_TRANSER_TO) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 46da580a0d1..71e6155056f 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -456,11 +456,11 @@ return if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. + SSshuttle.emergency.canRecall = FALSE SSshuttle.emergency.request(null, 0.5, null, " Automatic Crew Transfer", 1) - SSshuttle.emergency.canRecall = FALSE else - SSshuttle.emergency.request(null, 1, null, " Automatic Crew Transfer", 0) SSshuttle.emergency.canRecall = FALSE + SSshuttle.emergency.request(null, 1, null, " Automatic Crew Transfer", 0) if(user) log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle - [formatJumpTo(user)].", 1) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index a7345522b25..d5d469ccdd1 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -34,6 +34,24 @@ light_color = LIGHT_COLOR_DARKGREEN +/obj/machinery/computer/message_monitor/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD // Give the message server time to initialize + +/obj/machinery/computer/message_monitor/LateInitialize() + //If the monitor isn't linked to a server, and there's a server available, default it to the first one in the list. + if(!linkedServer && length(GLOB.message_servers)) + linkedServer = GLOB.message_servers[1] + RegisterSignal(linkedServer, COMSIG_PARENT_QDELETING, .proc/unlink_server) + +/obj/machinery/computer/message_monitor/proc/unlink_server() + SIGNAL_HANDLER + linkedServer = null + +/obj/machinery/computer/message_monitor/Destroy() + customrecepient = null + linkedServer = null + return ..() /obj/machinery/computer/message_monitor/screwdriver_act(mob/user, obj/item/I) if(emag) //Stops people from just unscrewing the monitor and putting it back to get the console working again. @@ -71,14 +89,6 @@ ..() -/obj/machinery/computer/message_monitor/Initialize() - ..() - //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. - if(!linkedServer) - if(GLOB.message_servers && GLOB.message_servers.len > 0) - linkedServer = GLOB.message_servers[1] - return - /obj/machinery/computer/message_monitor/attack_hand(mob/user as mob) if(..()) return @@ -490,18 +500,18 @@ /obj/item/paper/monitorkey - //..() name = "Monitor Decryption Key" var/obj/machinery/message_server/server = null -/obj/item/paper/monitorkey/New() +/obj/item/paper/monitorkey/Initialize(mapload) ..() - spawn(10) - if(GLOB.message_servers) - for(var/obj/machinery/message_server/server in GLOB.message_servers) - if(!isnull(server)) - if(!isnull(server.decryptkey)) - info = "

Daily Key Reset

\n\t
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." - info_links = info - overlays += "paper_words" - break + return INITIALIZE_HINT_LATELOAD + +/obj/item/paper/monitorkey/LateInitialize() + for(var/obj/machinery/message_server/server in GLOB.message_servers) + if(!isnull(server)) + if(!isnull(server.decryptkey)) + info = "

Daily Key Reset

\n\t
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." + info_links = info + overlays += "paper_words" + break diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index fbb6a0ad3c3..4ae74e8be58 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -257,7 +257,21 @@ to destroy them and players will be able to make replacements. "Robco Tool Maker" = /obj/machinery/vending/engineering, "BODA" = /obj/machinery/vending/sovietsoda, "SecTech" = /obj/machinery/vending/security, - "CritterCare" = /obj/machinery/vending/crittercare) + "CritterCare" = /obj/machinery/vending/crittercare, + "SecDrobe" = /obj/machinery/vending/secdrobe, + "DetDrobe" = /obj/machinery/vending/detdrobe, + "MediDrobe" = /obj/machinery/vending/medidrobe, + "ViroDrobe" = /obj/machinery/vending/virodrobe, + "ChemDrobe" = /obj/machinery/vending/chemdrobe, + "GeneDrobe" = /obj/machinery/vending/genedrobe, + "SciDrobe" = /obj/machinery/vending/scidrobe, + "RoboDrobe" = /obj/machinery/vending/robodrobe, + "EngiDrobe" = /obj/machinery/vending/engidrobe, + "AtmosDrobe" = /obj/machinery/vending/atmosdrobe, + "CargoDrobe" = /obj/machinery/vending/cargodrobe, + "ChefDrobe" = /obj/machinery/vending/chefdrobe, + "BarDrobe" = /obj/machinery/vending/bardrobe, + "HydroDrobe" = /obj/machinery/vending/hydrodrobe) /obj/item/circuitboard/vendor/screwdriver_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 5aac39d12dd..fe333ebf4ef 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -34,8 +34,8 @@ if(building) set_pixel_offsets_from_dir(30, -30, 30, -30) -/obj/machinery/defibrillator_mount/loaded/New() //loaded subtype for mapping use - ..() +/obj/machinery/defibrillator_mount/loaded/Initialize(mapload) //loaded subtype for mapping use + . = ..() defib = new/obj/item/defibrillator/loaded(src) update_icon() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index c4d5c4984b9..da287020804 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(holopads) use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 - layer = TURF_LAYER+0.1 //Preventing mice and drones from sneaking under them. + layer = HOLOPAD_LAYER //Preventing mice and drones from sneaking under them. plane = FLOOR_PLANE max_integrity = 300 armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index ae3520af45b..8096f0655f0 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -77,6 +77,7 @@ /obj/machinery/light_switch/attack_hand(mob/user) on = !on + playsound(src, 'sound/machines/lightswitch.ogg', 10, TRUE) updateicon() if(light_connect) diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 7bd89ac6dae..1a5a5ced2ec 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -11,7 +11,7 @@ name = "Electromagnetic Generator" desc = "A device that uses station power to create points of magnetic energy." level = 1 // underfloor - layer = 2.5 + layer = WIRE_LAYER+0.001 anchored = 1 use_power = IDLE_POWER_USE idle_power_usage = 50 @@ -32,7 +32,8 @@ /obj/machinery/magnetic_module/New() ..() var/turf/T = loc - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) center = T spawn(10) // must wait for map loading to finish diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 48d87d0f330..f43e0033e23 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -8,7 +8,8 @@ name = "navigation beacon" desc = "A radio beacon used for bot navigation." level = 1 // underfloor - layer = 2.5 + layer = WIRE_LAYER + plane = FLOOR_PLANE anchored = 1 max_integrity = 500 armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80) @@ -26,7 +27,8 @@ set_codes() var/turf/T = loc - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) if(!codes || !codes.len) log_runtime(EXCEPTION("Empty codes datum at ([x],[y],[z])"), src, list("codes_txt: '[codes_txt]'")) if("patrol" in codes) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index ac61c2cccc9..98eaf1ceb2e 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -337,12 +337,18 @@ fixdir() var/pipe_dir = get_pipe_dir() + var/turf/T = get_turf(loc) for(var/obj/machinery/atmospherics/M in src.loc) if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe to_chat(user, "There is already a pipe of the same type at this location.") return 1 + if(pipe_type in list(PIPE_SUPPLY_STRAIGHT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT, PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_SUPPLY_MANIFOLD, PIPE_SCRUBBERS_MANIFOLD, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_UVENT, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_PASV_VENT, PIPE_DP_VENT, PIPE_PASSIVE_GATE)) + if(T.transparent_floor) //stops jank with transparent floors and pipes + to_chat(user, "You can only fix simple pipes and devices over glass floors!") + return 1 + switch(pipe_type) //What kind of heartless person thought of doing this? if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT) var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc ) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5d979ff2044..12272549f74 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1780,3 +1780,327 @@ /obj/machinery/vending/crittercare/free prices = list() +//Departmental clothing vendors + +/obj/machinery/vending/secdrobe + name = "\improper SecDrobe" + desc = "A vending machine for security and security-related clothing!" + icon_state = "secdrobe" + ads_list = list("Beat perps in style!", "It's red so you can't see the blood!", "You have the right to be fashionable!", "Now you can be the fashion police you always wanted to be!") + vend_reply = "Thank you for using the SecDrobe!" + products = list(/obj/item/clothing/under/rank/security = 4, + /obj/item/clothing/under/rank/security2 = 4, + /obj/item/clothing/under/rank/security/formal = 4, + /obj/item/clothing/under/rank/security/skirt = 4, + /obj/item/clothing/under/rank/security/corp = 4, + /obj/item/clothing/under/rank/dispatch = 4, + /obj/item/clothing/head/beret/sec = 4, + /obj/item/clothing/head/soft/sec = 4, + /obj/item/clothing/head/soft/sec/corp = 4, + /obj/item/clothing/suit/armor/secjacket = 4, + /obj/item/clothing/suit/jacket/pilot = 2, + /obj/item/clothing/suit/hooded/wintercoat/security = 4, + /obj/item/clothing/gloves/color/black = 4, + /obj/item/clothing/accessory/armband/sec = 6, + /obj/item/clothing/shoes/laceup = 4, + /obj/item/clothing/shoes/jackboots = 4, + /obj/item/clothing/shoes/jackboots/jacksandals = 4, + /obj/item/storage/backpack/security = 2, + /obj/item/storage/backpack/satchel_sec = 2, + /obj/item/storage/backpack/duffel/security = 2) + premium = list(/obj/item/clothing/mask/gas/sechailer/swat = 2, + /obj/item/clothing/mask/balaclava = 1) + contraband = list(/obj/item/toy/figure/crew/secofficer = 1, + /obj/item/toy/figure/crew/hos = 1) + refill_canister = /obj/item/vending_refill/secdrobe + +/obj/machinery/vending/detdrobe + name = "\improper DetDrobe" + desc = "A machine for all your detective needs, as long as you only need clothes." + icon_state = "detdrobe" + ads_list = list("Apply your brilliant deductive methods in style!", "They already smell of cigarettes!") + vend_reply = "Thank you for using the DetDrobe!" + products = list(/obj/item/clothing/under/det = 2, + /obj/item/clothing/suit/storage/det_suit = 2, + /obj/item/clothing/suit/storage/det_suit/forensics/red = 1, + /obj/item/clothing/suit/storage/det_suit/forensics/blue = 1, + /obj/item/clothing/suit/armor/vest/det_suit = 1, + /obj/item/clothing/head/det_hat = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/brown = 2, + /obj/item/clothing/shoes/jackboots = 2, + /obj/item/clothing/head/fedora = 1, + /obj/item/clothing/head/fedora/brownfedora = 1, + /obj/item/clothing/head/fedora/whitefedora = 1, + /obj/item/clothing/gloves/color/black = 2, + /obj/item/clothing/gloves/color/latex = 2, + /obj/item/reagent_containers/food/drinks/flask/detflask = 2, + /obj/item/storage/fancy/cigarettes/dromedaryco = 5) + contraband = list(/obj/item/toy/figure/crew/detective = 1) + refill_canister = /obj/item/vending_refill/detdrobe + +/obj/machinery/vending/medidrobe + name = "\improper MediDrobe" + desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel." + icon_state = "medidrobe" + ads_list = list("Make those blood stains look fashionable!") + vend_reply = "Thank you for using the MediDrobe!" + products = list(/obj/item/clothing/under/rank/medical = 3, + /obj/item/clothing/under/rank/medical/skirt = 3, + /obj/item/clothing/under/rank/medical/blue = 3, + /obj/item/clothing/under/rank/medical/green = 3, + /obj/item/clothing/under/rank/medical/purple = 3, + /obj/item/clothing/under/rank/nurse = 3, + /obj/item/clothing/under/medigown = 3, + /obj/item/clothing/head/beret/med = 3, + /obj/item/clothing/head/surgery/blue = 3, + /obj/item/clothing/head/surgery/green = 3, + /obj/item/clothing/head/surgery/purple = 3, + /obj/item/clothing/head/nursehat = 3, + /obj/item/clothing/suit/hooded/wintercoat/medical = 3, + /obj/item/clothing/suit/storage/fr_jacket = 3, + /obj/item/clothing/suit/storage/labcoat = 3, + /obj/item/clothing/accessory/armband/med = 3, + /obj/item/clothing/accessory/armband/medgreen = 3, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/shoes/sandal/white = 3, + /obj/item/storage/backpack/medic = 2, + /obj/item/storage/backpack/satchel_med = 2, + /obj/item/storage/backpack/duffel/medical = 2) + premium = list(/obj/item/clothing/gloves/color/latex/nitrile = 3) + contraband = list(/obj/item/toy/figure/crew/md = 1) + refill_canister = /obj/item/vending_refill/medidrobe + +/obj/machinery/vending/virodrobe + name = "\improper ViroDrobe" + desc = "An unsterilized machine for dispending virology related clothing." + icon_state = "virodrobe" + ads_list = list("Viruses getting you down? Nothing a change of clothes can't fix!", "Upgrade to sterilized clothing today!") + vend_reply = "Thank you for using the ViroDrobe!" + products = list(/obj/item/clothing/under/rank/virologist = 2, + /obj/item/clothing/under/rank/virologist/skirt = 2, + /obj/item/clothing/head/beret/med = 2, + /obj/item/clothing/suit/storage/labcoat/virologist = 2, + /obj/item/clothing/accessory/armband/med = 2, + /obj/item/clothing/mask/surgical = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/white = 2, + /obj/item/clothing/shoes/sandal/white = 2, + /obj/item/storage/backpack/virology = 2, + /obj/item/storage/backpack/satchel_vir = 2, + /obj/item/storage/backpack/duffel/virology = 2) + contraband = list(/obj/item/toy/figure/crew/virologist = 1) + refill_canister = /obj/item/vending_refill/virodrobe + +/obj/machinery/vending/chemdrobe + name = "\improper ChemDrobe" + desc = "A vending machine for dispensing chemistry related clothing." + icon_state = "chemdrobe" + ads_list = list("Our clothes are 0.5% more resistant to acid spills! Get yours now!") + vend_reply = "Thank you for using the ChemDrobe!" + products = list(/obj/item/clothing/under/rank/chemist = 2, + /obj/item/clothing/under/rank/chemist/skirt = 2, + /obj/item/clothing/head/beret/med = 2, + /obj/item/clothing/suit/storage/labcoat/chemist = 2, + /obj/item/clothing/accessory/armband/med = 2, + /obj/item/clothing/mask/gas = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/white = 2, + /obj/item/clothing/shoes/sandal/white = 2, + /obj/item/storage/bag/chemistry = 2, + /obj/item/storage/backpack/chemistry = 2, + /obj/item/storage/backpack/satchel_chem = 2, + /obj/item/storage/backpack/duffel/chemistry = 2) + contraband = list(/obj/item/toy/figure/crew/chemist = 1) + refill_canister = /obj/item/vending_refill/chemdrobe + + +/obj/machinery/vending/genedrobe + name = "GeneDrobe" + desc = "A machine for dispensing clothing related to genetics." + icon_state = "genedrobe" + ads_list = "Perfect for the mad scientist in you!" + vend_reply = "Thank you for using the GeneDrobe!" + + products = list(/obj/item/clothing/under/rank/geneticist = 3, + /obj/item/clothing/suit/storage/labcoat/genetics = 3, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/shoes/sandal/white = 3, + /obj/item/storage/backpack/genetics = 2, + /obj/item/storage/backpack/satchel_gen = 2, + /obj/item/storage/backpack/duffel/genetics = 2,) + contraband = list(/obj/item/toy/figure/crew/geneticist = 1) + refill_canister = /obj/item/vending_refill/genedrobe + +/obj/machinery/vending/scidrobe + name = "SciDrobe" + desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Space Cubans." + icon_state = "scidrobe" + ads_list = list("Longing for the smell of plasma burnt flesh?", "Buy your science clothing now!", "Made with 10% Auxetics, so you don't have to worry about losing your arm!") + vend_reply = "Thank you for using the SciDrobe!" + products = list(/obj/item/clothing/under/rank/scientist = 6, + /obj/item/clothing/under/rank/scientist/skirt = 3, + /obj/item/clothing/suit/hooded/wintercoat/science = 3, + /obj/item/clothing/suit/storage/labcoat/science = 3, + /obj/item/clothing/head/beret/sci = 3, + /obj/item/clothing/accessory/armband/science = 6, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/shoes/sandal/white = 3, + /obj/item/storage/backpack/science = 2, + /obj/item/storage/backpack/satchel_tox = 2, + /obj/item/storage/backpack/duffel/science = 2,) + contraband = list(/obj/item/toy/figure/crew/rd = 1, + /obj/item/toy/figure/crew/scientist = 1) + refill_canister = /obj/item/vending_refill/scidrobe + +/obj/machinery/vending/robodrobe + name = "RoboDrobe" + desc = "A vending machine designed to dispense clothing known only to roboticists." + icon_state = "robodrobe" + ads_list = list("You turn me TRUE, use defines!","0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101") + vend_reply = "Thank you for using the RoboDrobe!" + products = list(/obj/item/clothing/under/rank/roboticist = 3, + /obj/item/clothing/under/rank/roboticist/skirt = 3, + /obj/item/clothing/suit/storage/labcoat = 3, + /obj/item/clothing/head/soft/black = 3, + /obj/item/clothing/gloves/fingerless = 3, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/shoes/black = 3) + contraband = list(/obj/item/toy/figure/crew/roboticist = 1) + refill_canister = /obj/item/vending_refill/robodrobe + +/obj/machinery/vending/engidrobe + name = "EngiDrobe" + desc = "A vending machine renowned for vending industrial grade clothing." + icon_state = "engidrobe" + ads_list = list("Guaranteed to protect your feet from industrial accidents!", "Afraid of radiation? Then wear yellow!") + vend_reply = "Thank you for using the SciDrobe!" + products = list(/obj/item/clothing/under/rank/engineer = 6, + /obj/item/clothing/under/rank/engineer/skirt = 3, + /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, + /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/head/beret/eng = 3, + /obj/item/clothing/head/hardhat = 2, + /obj/item/clothing/head/hardhat/white = 2, + /obj/item/clothing/head/hardhat/orange = 2, + /obj/item/clothing/head/hardhat/dblue = 2, + /obj/item/clothing/accessory/armband/engine = 6, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/workboots = 3, + /obj/item/storage/backpack/industrial = 2, + /obj/item/storage/backpack/satchel_eng = 2, + /obj/item/storage/backpack/duffel/engineering = 2, + /obj/item/storage/belt/utility = 2) + premium = list(/obj/item/storage/belt/utility/chief = 2, + /obj/item/clothing/gloves/color/yellow = 2) + contraband = list(/obj/item/toy/figure/crew/ce = 1, + /obj/item/toy/figure/crew/engineer = 1) + refill_canister = /obj/item/vending_refill/engidrobe + +/obj/machinery/vending/atmosdrobe + name = "AtmosDrobe" + desc = "This relatively unknown vending machine delivers clothing for Atmospherics Technicians, an equally unknown job." + icon_state = "atmosdrobe" + ads_list = list("Guaranteed to protect your feet from atmospheric accidents!", "Get your inflammable clothing right here!") + vend_reply = "Thank you for using the AtmosDrobe!" + products = list(/obj/item/clothing/under/rank/atmospheric_technician = 6, + /obj/item/clothing/under/rank/atmospheric_technician/skirt = 3, + /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, + /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/head/beret/atmos = 3, + /obj/item/clothing/head/hardhat = 2, + /obj/item/clothing/head/hardhat/red = 2, + /obj/item/clothing/head/hardhat/white = 2, + /obj/item/clothing/head/hardhat/orange = 2, + /obj/item/clothing/head/hardhat/dblue = 2, + /obj/item/clothing/gloves/color/black = 3, + /obj/item/clothing/accessory/armband/engine = 3, + /obj/item/clothing/shoes/laceup = 3, + /obj/item/clothing/shoes/workboots = 3, + /obj/item/storage/backpack/industrial = 2, + /obj/item/storage/backpack/satchel_eng = 2, + /obj/item/storage/backpack/duffel/atmos = 2, + /obj/item/storage/belt/utility = 2) + premium = list(/obj/item/storage/belt/utility/chief = 2) + contraband = list(/obj/item/toy/figure/crew/atmos = 1) + refill_canister = /obj/item/vending_refill/atmosdrobe + +/obj/machinery/vending/cargodrobe + name = "CargoDrobe" + desc = "A highly advanced vending machine for buying cargo related clothing for free... most of the time." + icon_state = "cargodrobe" + ads_list = list("Upgraded Assistant Style! Pick yours today!", "These shorts are comfy and easy to wear, get yours now!") + vend_reply = "Thank you for using the CargoDrobe!" + products = list(/obj/item/clothing/under/rank/cargotech = 6, + /obj/item/clothing/under/rank/cargotech/skirt = 3, + /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, + /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/head/soft = 3, + /obj/item/clothing/head/hardhat/orange = 2, + /obj/item/clothing/gloves/fingerless = 6, + /obj/item/clothing/accessory/armband/cargo = 6, + /obj/item/clothing/shoes/black = 3, + /obj/item/clothing/shoes/workboots = 3) + contraband = list(/obj/item/toy/figure/crew/qm = 1, + /obj/item/toy/figure/crew/cargotech = 1) + refill_canister = /obj/item/vending_refill/cargodrobe + +/obj/machinery/vending/chefdrobe + name = "ChefDrobe" + desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing." + icon_state = "chefdrobe" + ads_list = list("Our clothes are guaranteed to protect you from food splatters!", "Comfortable enough for a CQC practice!") + vend_reply = "Thank you for using the ChefDrobe!" + products = list(/obj/item/clothing/under/rank/chef = 2, + /obj/item/clothing/under/waiter = 2, + /obj/item/clothing/suit/chef = 2, + /obj/item/clothing/suit/chef/classic = 2, + /obj/item/clothing/head/chefhat = 2, + /obj/item/clothing/head/soft/mime = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/white = 2, + /obj/item/clothing/shoes/black = 2, + /obj/item/clothing/accessory/waistcoat = 2) + contraband = list(/obj/item/toy/figure/crew/chef = 1) + refill_canister = /obj/item/vending_refill/chefdrobe + +/obj/machinery/vending/bardrobe + name = "BarDrobe" + desc = "A stylish vendor to dispense the most stylish bar clothing!" + icon_state = "bardrobe" + ads_list = list("Guaranteed to prevent stains from spilled drinks!") + vend_reply = "Thank you for using the BarDrobe!" + products = list(/obj/item/clothing/under/rank/bartender = 2, + /obj/item/clothing/under/sl_suit = 2, + /obj/item/clothing/head/that = 2, + /obj/item/clothing/head/soft/black = 2, + /obj/item/clothing/suit/blacktrenchcoat = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/black = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/reagent_containers/glass/rag = 3) + contraband = list(/obj/item/toy/figure/crew/bartender = 1) + refill_canister = /obj/item/vending_refill/bardrobe + +/obj/machinery/vending/hydrodrobe + name = "HydroDrobe" + desc = "A machine with a catchy name. It dispenses botany related clothing and gear." + icon_state = "hydrobe" + ads_list = list("Do you love soil? Then buy our clothes!", "Get outfits to match your green thumb here!") + vend_reply = "Thank you for using the HydroDrobe!" + products = list(/obj/item/clothing/under/rank/hydroponics = 3, + /obj/item/reagent_containers/glass/bucket = 3, + /obj/item/clothing/suit/apron = 3, + /obj/item/clothing/suit/apron/overalls = 3, + /obj/item/clothing/mask/bandana/botany = 3, + /obj/item/clothing/accessory/armband/hydro = 3, + /obj/item/storage/backpack/botany = 2, + /obj/item/storage/backpack/satchel_hyd = 2, + /obj/item/storage/backpack/duffel/hydro = 2,) + contraband = list(/obj/item/toy/figure/crew/botanist = 1) + refill_canister = /obj/item/vending_refill/hydrodrobe diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index d762543f807..23f251efaff 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -42,11 +42,11 @@ user.mind.add_antag_datum(/datum/antagonist/wishgranter) to_chat(user, "You have a very bad feeling about this.") - + /obj/machinery/wish_granter/super name = "super wish granter" var/list/types = list() - + /obj/machinery/wish_granter/super/attack_hand(mob/living/carbon/user) . = ..() @@ -60,9 +60,9 @@ if(is_special_character(user) || jobban_isbanned(user, ROLE_TRAITOR) || jobban_isbanned(user, ROLE_SYNDICATE)) to_chat(user, "Something instinctual makes you pull away.") return TRUE - + to_chat(user, "Your touch makes the Wish Granter stir. Are you really sure you want to do this?") - + for(var/supname in GLOB.all_superheroes) types += supname @@ -85,6 +85,6 @@ playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1) visible_message("The wishgranter fades into mist..") - add_attack_logs(null, user, "Became [GLOB.all_superheroes[wish]]") + add_attack_logs(user, user, "Became [GLOB.all_superheroes[wish]]") notify_ghosts("[GLOB.all_superheroes[wish]] has appeared in [get_area(user)].", source = user) qdel(src) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 351aba3905b..2b04b105535 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -165,7 +165,7 @@ if(istype(firer, /mob)) add_attack_logs(firer, M, "Mecha-shot with [src]") else - add_attack_logs(null, M, "Mecha-shot with [src]") + add_attack_logs(src, M, "Mecha-shot with [src] (no firer)") if(life <= 0) qdel(src) return diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 13b5d6f1be2..dda33b8495d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -767,13 +767,13 @@ /datum/construction/mecha/honker_chassis/spawn_result() ..("Honker") var/obj/item/mecha_parts/chassis/const_holder = holder - const_holder.construct = new /datum/construction/mecha/honker(const_holder) + const_holder.construct = new /datum/construction/reversible/mecha/honker(const_holder) const_holder.density = 1 qdel(src) return -/datum/construction/mecha/honker +/datum/construction/reversible/mecha/honker result = "/obj/mecha/combat/honker" steps = list(list("key"=/obj/item/bikehorn),//1 list("key"=/obj/item/clothing/shoes/clown_shoes),//2 @@ -788,10 +788,10 @@ list("key"=/obj/item/bikehorn),//11 ) -/datum/construction/mecha/honker/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/honker/action(atom/used_atom,mob/user as mob) return check_step(used_atom,user) -/datum/construction/mecha/honker/custom_action(step, atom/used_atom, mob/user) +/datum/construction/reversible/mecha/honker/custom_action(index, diff, atom/used_atom, mob/user) if(!..()) return 0 @@ -800,7 +800,7 @@ user.visible_message("HONK!") //TODO: better messages. - switch(step) + switch(index) if(10) user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") qdel(used_atom) @@ -839,12 +839,12 @@ /datum/construction/mecha/reticence_chassis/spawn_result() ..("Reticence") var/obj/item/mecha_parts/chassis/const_holder = holder - const_holder.construct = new /datum/construction/mecha/reticence(const_holder) + const_holder.construct = new /datum/construction/reversible/mecha/reticence(const_holder) const_holder.density = 1 qdel(src) return -/datum/construction/mecha/reticence +/datum/construction/reversible/mecha/reticence result = "/obj/mecha/combat/reticence" steps = list(list("key"=/obj/effect/dummy/mecha_emote_step),//1 list("key"=/obj/item/clothing/suit/suspenders),//2 @@ -857,10 +857,10 @@ list("key"=/obj/item/circuitboard/mecha/reticence/main),//9 ) -/datum/construction/mecha/reticence/action(atom/used_atom,mob/user) +/datum/construction/reversible/mecha/reticence/action(atom/used_atom,mob/user) return check_step(used_atom,user) -/datum/construction/mecha/reticence/custom_action(step, atom/used_atom, mob/user) +/datum/construction/reversible/mecha/reticence/custom_action(index, diff, atom/used_atom, mob/user) if(!..()) return 0 @@ -870,7 +870,7 @@ qdel(used_atom) //TODO: better messages. - switch(step) + switch(index) if(9) user.visible_message("[user] installs the central control module into the [holder].", "You install the central control module into the [holder].") qdel(used_atom) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 52b3a2263fa..5800175ee3c 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -218,11 +218,11 @@ emote = e /obj/item/mecha_parts/chassis/reticence/hear_message(mob/living/M, msg) - if(!istype(M) || !istype(construct, /datum/construction/mecha/reticence)) + if(!istype(M) || !istype(construct, /datum/construction/reversible/mecha/reticence)) return // is the current step the dummy emote object? var/list/steps = construct.steps - if(steps[steps.len]["key"] == /obj/effect/dummy/mecha_emote_step) + if(steps[construct.index]["key"] == /obj/effect/dummy/mecha_emote_step) construct.action(new /obj/effect/dummy/mecha_emote_step(msg), M) /obj/item/mecha_parts/part/reticence_torso diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm index 1d498888588..20f43f6eea2 100644 --- a/code/game/objects/effects/spawners/windowspawner.dm +++ b/code/game/objects/effects/spawners/windowspawner.dm @@ -59,6 +59,12 @@ window_to_spawn_regular = /obj/structure/window/reinforced/tinted window_to_spawn_full = /obj/structure/window/full/reinforced/tinted +/obj/effect/spawner/window/reinforced/polarized + name = "electrochromic reinforced window spawner" + icon_state = "pwindow_spawner" + window_to_spawn_regular = /obj/structure/window/reinforced/polarized + window_to_spawn_full = /obj/structure/window/full/reinforced/polarized + /obj/effect/spawner/window/shuttle name = "shuttle window spawner" icon_state = "swindow_spawner" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 2d014e9e6c2..1a6edd1dd45 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -117,6 +117,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect var/in_inventory = FALSE //is this item equipped into an inventory slot or hand of a mob? var/tip_timer = 0 + // item hover FX + /// Is this item inside a storage object? + var/in_storage = FALSE + /// Holder var for the item outline filter, null when no outline filter on the item. + var/outline_filter + /obj/item/New() ..() for(var/path in actions_types) @@ -131,6 +137,11 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if(!move_resist) determine_move_resist() +/obj/item/Initialize(mapload) + . = ..() + if(istype(loc, /obj/item/storage)) //marks all items in storage as being such + in_storage = TRUE + /obj/item/proc/determine_move_resist() switch(w_class) if(WEIGHT_CLASS_TINY) @@ -406,6 +417,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if((flags & NODROP) && !(initial(flags) & NODROP)) //Remove NODROP is dropped flags &= ~NODROP in_inventory = FALSE + remove_outline() SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) if(!silent) playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE) @@ -418,10 +430,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect // called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. /obj/item/proc/on_exit_storage(obj/item/storage/S as obj) + in_storage = FALSE return // called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item. /obj/item/proc/on_enter_storage(obj/item/storage/S as obj) + in_storage = TRUE return /** @@ -691,14 +705,24 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect openToolTip(user, src, params, title = name, content = "[desc]", theme = "") /obj/item/MouseEntered(location, control, params) - if(in_inventory) + if(in_inventory || in_storage) var/timedelay = 8 - var/user = usr + var/mob/user = usr tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE) + if(QDELETED(src)) + return + var/mob/living/L = user + if(!(user.client.prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES)) + return + if(istype(L) && L.incapacitated(ignore_lying = TRUE)) + apply_outline(L, COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now + else + apply_outline(L) //if the player's alive and well we send the command with no color set, so it uses the theme's color /obj/item/MouseExited() deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes closeToolTip(usr) + remove_outline() /obj/item/MouseDrop_T(obj/item/I, mob/user) if(!user || user.incapacitated(ignore_lying = TRUE) || src == I) @@ -707,6 +731,41 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if(loc && I.loc == loc && istype(loc, /obj/item/storage) && loc.Adjacent(user)) // Are we trying to swap two items in the storage? var/obj/item/storage/S = loc S.swap_items(src, I, user) + remove_outline() //get rid of the hover effect in case the mouse exit isn't called if someone drags and drops an item and somthing goes wrong + +/obj/item/proc/apply_outline(mob/user, outline_color = null) + if(!(in_inventory || in_storage) || QDELETED(src) || isobserver(user)) //cancel if the item isn't in an inventory, is being deleted, or if the person hovering is a ghost (so that people spectating you don't randomly make your items glow) + return + var/theme = lowertext(user.client.prefs.UI_style) + if(!outline_color) //if we weren't provided with a color, take the theme's color + switch(theme) //yeah it kinda has to be this way + if("midnight") + outline_color = COLOR_THEME_MIDNIGHT + if("plasmafire") + outline_color = COLOR_THEME_PLASMAFIRE + if("retro") + outline_color = COLOR_THEME_RETRO //just as garish as the rest of this theme + if("slimecore") + outline_color = COLOR_THEME_SLIMECORE + if("operative") + outline_color = COLOR_THEME_OPERATIVE + if("clockwork") + outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass' + if("glass") + outline_color = COLOR_THEME_GLASS + else //this should never happen, hopefully + outline_color = COLOR_WHITE + if(color) + outline_color = COLOR_WHITE //if the item is recolored then the outline will be too, let's make the outline white so it becomes the same color instead of some ugly mix of the theme and the tint + if(outline_filter) + filters -= outline_filter + outline_filter = filter(type = "outline", size = 1, color = outline_color) + filters += outline_filter + +/obj/item/proc/remove_outline() + if(outline_filter) + filters -= outline_filter + outline_filter = null // Returns a numeric value for sorting items used as parts in machines, so they can be replaced by the rped /obj/item/proc/get_part_rating() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 85e650412f6..de7b769957e 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -195,23 +195,16 @@ if(target.status != LIGHT_EMPTY) AddShards(1, U) target.status = LIGHT_EMPTY - target.update() - var/obj/item/light/L2 = new target.light_type() - - target.status = L2.status - target.switchcount = L2.switchcount + var/obj/item/light/replacement = target.light_type + target.status = LIGHT_OK + target.switchcount = 0 target.rigged = emagged - target.brightness_range = L2.brightness_range - target.brightness_power = L2.brightness_power - target.brightness_color = L2.brightness_color + target.brightness_range = initial(replacement.brightness_range) + target.brightness_power = initial(replacement.brightness_power) + target.brightness_color = initial(replacement.brightness_color) target.on = target.has_power() - target.update() - qdel(L2) - - if(target.on && target.rigged) - target.explode() - return + target.update(TRUE, TRUE, FALSE) else to_chat(U, "[src]'s refill light blinks red.") diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index ce8c6ca7191..ced5a810bf4 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -13,7 +13,7 @@ var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!") /obj/item/megaphone/attack_self(mob/living/user as mob) - if(user.client && (user.client.prefs.muted & MUTE_IC)) + if(check_mute(user.ckey, MUTE_IC)) to_chat(src, "You cannot speak in IC (muted).") return if(!ishuman(user)) diff --git a/code/game/objects/items/devices/painter/pipe_painter.dm b/code/game/objects/items/devices/painter/pipe_painter.dm index 4ad7b16b293..17c383809aa 100644 --- a/code/game/objects/items/devices/painter/pipe_painter.dm +++ b/code/game/objects/items/devices/painter/pipe_painter.dm @@ -27,8 +27,8 @@ return var/turf/T = get_turf(P) - if(P.level < 2 && T.level == 1 && T.intact) - to_chat(user, "You must remove the plating first.") + if(P.level < 2 && T.level == 1 && T.intact && !T.transparent_floor) + to_chat(user, "You must remove the flooring first.") return P.change_color(GLOB.pipe_colors[paint_setting]) diff --git a/code/game/objects/items/mountable_frames/buttons_switches.dm b/code/game/objects/items/mountable_frames/buttons_switches.dm index 76e4f0ecfd4..30b77ea2f33 100644 --- a/code/game/objects/items/mountable_frames/buttons_switches.dm +++ b/code/game/objects/items/mountable_frames/buttons_switches.dm @@ -21,3 +21,11 @@ /obj/item/mounted/frame/light_switch/do_build(turf/on_wall, mob/user) new /obj/machinery/light_switch(get_turf(user), get_dir(user, on_wall)) qdel(src) + +/obj/item/mounted/frame/light_switch/windowtint + name = "window tint control button frame" + desc = "Used for repairing or building window tint control buttons" + +/obj/item/mounted/frame/light_switch/windowtint/do_build(turf/on_wall, mob/user) + new /obj/machinery/button/windowtint(get_turf(user), get_dir(user, on_wall)) + qdel(src) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index c736026bca8..adf6fa59869 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -1,6 +1,17 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ - new/datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("table frame", /obj/structure/table_frame, 2, time = 10, one_per_turf = 1, on_floor = 1), \ + null, + new /datum/stack_recipe("railing", /obj/structure/railing, 3, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("railing corner", /obj/structure/railing/corner, 3, time = 10, one_per_turf = 1, on_floor = 1), \ + null, + new /datum/stack_recipe_list("chainlink fence", list( \ + new /datum/stack_recipe("chainlink fence", /obj/structure/fence, 5, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("chainlink fence post", /obj/structure/fence/post, 5, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("chainlink fence corner", /obj/structure/fence/corner, 5, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("chainlink fence door", /obj/structure/fence/door, 10, time = 10, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("chainlink fence end", /obj/structure/fence/end, 3, time = 10, one_per_turf = 1, on_floor = 1), \ + )), \ )) /obj/item/stack/rods diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index c9901c8b0fe..1f8ae46083e 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -89,7 +89,10 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ new/datum/stack_recipe/window("windoor frame", /obj/structure/windoor_assembly, 5, time = 0, on_floor = TRUE, window_checks = TRUE), \ null, \ new/datum/stack_recipe/window("directional reinforced window", /obj/structure/window/reinforced, time = 0, on_floor = TRUE, window_checks = TRUE), \ - new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \ + new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ + null, \ + new/datum/stack_recipe/window("directional electrochromic window", /obj/structure/window/reinforced/polarized, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ + new/datum/stack_recipe/window("fulltile electrochromic window", /obj/structure/window/full/reinforced/polarized, 4, time = 0, on_floor = TRUE, window_checks = TRUE) \ )) /obj/item/stack/sheet/rglass diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1e3ab35178b..26f2f286e36 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( null, new /datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), new /datum/stack_recipe("light switch frame", /obj/item/mounted/frame/light_switch, 1, time = 50, one_per_turf = 0, on_floor = 1), + new /datum/stack_recipe("window tint control button frame", /obj/item/mounted/frame/light_switch/windowtint, 1, time = 50, one_per_turf = 0, on_floor = 1), null, new /datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade), new /datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2), diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index e76207ae85c..4cf977dc91c 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -3,6 +3,7 @@ /obj/item/defibrillator name = "defibrillator" desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients." + icon = 'icons/obj/defib.dmi' icon_state = "defibunit" item_state = "defibunit" slot_flags = SLOT_BACK @@ -17,27 +18,27 @@ ) var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) - var/safety = TRUE //if you can zap people with the defibs on harm mode var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/obj/item/twohanded/shockpaddles/paddles var/obj/item/stock_parts/cell/high/cell = null + var/safety = TRUE //if you can zap people with the defibs on harm mode var/combat = FALSE //can we revive through space suits? + var/heart_attack = FALSE //can it give instant heart attacks when zapped on harm intent with combat? + var/base_icon_state = "defibpaddles" + var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles /obj/item/defibrillator/get_cell() return cell -/obj/item/defibrillator/New() //starts without a cell for rnd - ..() - paddles = make_paddles() +/obj/item/defibrillator/Initialize(mapload) //starts without a cell for rnd + . = ..() + paddles = new paddle_type(src) update_icon() - return -/obj/item/defibrillator/loaded/New() //starts with hicap - ..() - paddles = make_paddles() +/obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap + . = ..() cell = new(src) update_icon() - return /obj/item/defibrillator/update_icon() update_power() @@ -158,9 +159,6 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/defibrillator/proc/make_paddles() - return new /obj/item/twohanded/shockpaddles(src) - /obj/item/defibrillator/equipped(mob/user, slot) ..() if(slot != slot_back) @@ -214,38 +212,68 @@ /obj/item/defibrillator/compact name = "compact defibrillator" - desc = "A belt-equipped defibrillator that can be rapidly deployed." + desc = "A belt-mounted defibrillator that can be rapidly deployed." icon_state = "defibcompact" item_state = "defibcompact" + sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm w_class = WEIGHT_CLASS_NORMAL slot_flags = SLOT_BELT origin_tech = "biotech=5" +/obj/item/defibrillator/compact/loaded/Initialize(mapload) + . = ..() + cell = new(src) + update_icon() + /obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user) if(slot == slot_belt) return TRUE -/obj/item/defibrillator/compact/loaded/New() - ..() - paddles = make_paddles() - cell = new(src) - update_icon() - return - /obj/item/defibrillator/compact/combat name = "combat defibrillator" - desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits." + desc = "A belt-mounted blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits." + icon_state = "defibcombat" + item_state = "defibcombat" + paddle_type = /obj/item/twohanded/shockpaddles/syndicate combat = TRUE safety = FALSE -/obj/item/defibrillator/compact/combat/loaded/New() - ..() - paddles = make_paddles() +/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload) + . = ..() cell = new(src) update_icon() - return -/obj/item/defibrillator/compact/combat/attackby(obj/item/W, mob/user, params) +/obj/item/defibrillator/compact/advanced + name = "advanced compact defibrillator" + desc = "A belt-mounted state-of-the-art defibrillator that can be rapidly deployed in all environments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. Can be used to defibrillate through space suits. It is impossible to damage." + icon_state = "defibnt" + item_state = "defibnt" + paddle_type = /obj/item/twohanded/shockpaddles/advanced + combat = TRUE + safety = TRUE + heart_attack = TRUE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Objective item, better not have it destroyed. + + var/next_emp_message //to prevent spam from the emagging message on the advanced defibrillator + +/obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params) + if(W == paddles) + paddles.unwield() + toggle_paddles() + update_icon() + +/obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload) + . = ..() + cell = new /obj/item/stock_parts/cell/bluespace/charging(src) + update_icon() + +/obj/item/defibrillator/compact/advanced/emp_act(severity) + if(world.time > next_emp_message) + atom_say("Warning: Electromagnetic pulse detected. Integrated shielding prevented all potential hardware damage.") + playsound(src, 'sound/machines/defib_saftyon.ogg', 50) + next_emp_message = world.time + 5 SECONDS + +/obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params) if(W == paddles) paddles.unwield() toggle_paddles() @@ -257,6 +285,7 @@ /obj/item/twohanded/shockpaddles name = "defibrillator paddles" desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." + icon = 'icons/obj/defib.dmi' icon_state = "defibpaddles" item_state = "defibpaddles" force = 0 @@ -268,6 +297,7 @@ var/revivecost = 1000 var/cooldown = FALSE var/busy = FALSE + var/base_icon_state = "defibpaddles" var/obj/item/defibrillator/defib /obj/item/twohanded/shockpaddles/New(mainunit) @@ -280,10 +310,10 @@ return /obj/item/twohanded/shockpaddles/update_icon() - icon_state = "defibpaddles[wielded]" - item_state = "defibpaddles[wielded]" + icon_state = "[base_icon_state][wielded]" + item_state = "[base_icon_state][wielded]" if(cooldown) - icon_state = "defibpaddles[wielded]_cooldown" + icon_state = "[base_icon_state][wielded]_cooldown" /obj/item/twohanded/shockpaddles/suicide_act(mob/user) user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.") @@ -336,7 +366,7 @@ to_chat(user, "[defib] is recharging.") return if(!ishuman(M)) - to_chat(user, "The instructions on [defib] don't mention how to revive that...") + to_chat(user, "The instructions on [defib] don't mention how to defibrillate that...") return else if(user.a_intent == INTENT_HARM && !defib.safety) @@ -347,7 +377,7 @@ H.Weaken(5) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) H.emote("gasp") - if(!H.undergoing_cardiac_arrest() && (prob(10) || defib.combat)) // Your heart explodes. + if(!H.undergoing_cardiac_arrest() && (prob(10) || (defib.combat && !defib.heart_attack) || prob(10) && (defib.combat && defib.heart_attack))) // Your heart explodes. H.set_heartattack(TRUE) SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100) add_attack_logs(user, M, "Stunned with [src]") @@ -470,7 +500,8 @@ /obj/item/borg_defib name = "defibrillator paddles" - desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks." + desc = "A pair of paddles with flat metal surfaces that are used to deliver powerful electric shocks." + icon = 'icons/obj/defib.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" force = 0 @@ -590,3 +621,17 @@ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) busy = FALSE update_icon() + +/obj/item/twohanded/shockpaddles/syndicate + name = "combat defibrillator paddles" + desc = "A pair of high-tech paddles with flat plasteel surfaces to revive deceased operatives (unless they exploded). They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively." + icon_state = "syndiepaddles0" + item_state = "syndiepaddles0" + base_icon_state = "syndiepaddles" + +/obj/item/twohanded/shockpaddles/advanced + name = "advanced defibrillator paddles" + desc = "A pair of high-tech paddles with flat plasteel surfaces that are used to deliver powerful electric shocks. They possess the ability to penetrate armor to deliver shock." + icon_state = "ntpaddles0" + item_state = "ntpaddles0" + base_icon_state = "ntpaddles" diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 46d347e0db7..02b53d2ff56 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -170,28 +170,6 @@ block = GLOB.hulkblock ..() -/obj/item/dnainjector/xraymut - name = "DNA-Injector (Xray)" - desc = "Finally you can see what the Captain does." - datatype = DNA2_BUF_SE - value = 0xFFF - forcedmutation = TRUE - -/obj/item/dnainjector/xraymut/Initialize() - block = GLOB.xrayblock - ..() - -/obj/item/dnainjector/antixray - name = "DNA-Injector (Anti-Xray)" - desc = "It will make you see harder." - datatype = DNA2_BUF_SE - value = 0x001 - forcedmutation = TRUE - -/obj/item/dnainjector/antixray/Initialize() - block = GLOB.xrayblock - ..() - /obj/item/dnainjector/firemut name = "DNA-Injector (Fire)" desc = "Gives you fire." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 9fb4684f3ff..972ab8ed7bd 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -716,7 +716,6 @@ new /obj/item/stack/cable_coil(src) new /obj/item/restraints/handcuffs(src) - new /obj/item/dnainjector/xraymut(src) new /obj/item/dnainjector/firemut(src) new /obj/item/dnainjector/telemut(src) new /obj/item/dnainjector/hulkmut(src) diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index c4d4d5090e5..4caab3fd918 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -152,3 +152,61 @@ /obj/item/vending_refill/robotics machine_name = "Robotech Deluxe" icon_state = "refill_engi" + +//Departmental clothing vendors + +/obj/item/vending_refill/secdrobe + machine_name = "SecDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/detdrobe + machine_name = "DetDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/medidrobe + machine_name = "MediDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/virodrobe + machine_name = "ViroDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/chemdrobe + machine_name = "ChemDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/genedrobe + machine_name = "GeneDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/scidrobe + machine_name = "SciDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/robodrobe + machine_name = "RoboDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/engidrobe + machine_name = "EngiDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/atmosdrobe + machine_name = "AtmosDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/cargodrobe + machine_name = "CargoDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/chefdrobe + machine_name = "ChefDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/bardrobe + machine_name = "BarDrobe" + icon_state = "refill_clothes" + +/obj/item/vending_refill/hydrodrobe + machine_name = "HydroDrobe" + icon_state = "refill_clothes" diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index b796740a60b..7330819e7d0 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -90,7 +90,7 @@ /obj/blob_act(obj/structure/blob/B) if(isturf(loc)) var/turf/T = loc - if(T.intact && level == 1) //the blob doesn't destroy thing below the floor + if((T.intact && level == 1) || T.transparent_floor) //the blob doesn't destroy thing below the floor return take_damage(400, BRUTE, "melee", 0, get_dir(src, B)) @@ -199,7 +199,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /obj/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(isturf(loc)) var/turf/T = loc - if(T.intact && level == 1) //fire can't damage things hidden below the floor. + if((T.intact && level == 1) || T.transparent_floor) //fire can't damage things hidden below the floor. return ..() if(exposed_temperature && !(resistance_flags & FIRE_PROOF)) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 4d58c90a095..6d1b884177d 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -59,30 +59,31 @@ /obj/structure/proc/do_climb(mob/living/user) if(!can_touch(user) || !climbable) - return + return FALSE var/blocking_object = density_check() if(blocking_object) to_chat(user, "You cannot climb [src], as it is blocked by \a [blocking_object]!") - return + return FALSE var/turf/T = src.loc - if(!T || !istype(T)) return + if(!T || !istype(T)) return FALSE usr.visible_message("[user] starts climbing onto \the [src]!") climber = user if(!do_after(user, 50, target = src)) climber = null - return + return FALSE if(!can_touch(user) || !climbable) climber = null - return + return FALSE usr.loc = get_turf(src) if(get_turf(user) == get_turf(src)) usr.visible_message("[user] climbs onto \the [src]!") climber = null + return TRUE /obj/structure/proc/structure_shaken() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a56c63937e3..555124cbb47 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -182,7 +182,7 @@ new /obj/item/clothing/shoes/brown (src) new /obj/item/radio/headset/heads/cmo(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) - new /obj/item/defibrillator/compact/loaded(src) + new /obj/item/defibrillator/compact/advanced/loaded(src) new /obj/item/handheld_defibrillator(src) new /obj/item/storage/belt/medical(src) new /obj/item/flash(src) diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm new file mode 100644 index 00000000000..21ad71f329f --- /dev/null +++ b/code/game/objects/structures/fence.dm @@ -0,0 +1,216 @@ +//Chain link fences +//Sprites ported from /VG/ + +#define CUT_TIME 100 +#define CLIMB_TIME 150 + +#define NO_HOLE 0 //section is intact +#define MEDIUM_HOLE 1 //medium hole in the section - can climb through +#define LARGE_HOLE 2 //large hole in the section - can walk through +#define MAX_HOLE_SIZE LARGE_HOLE +#define HOLE_REPAIR (hole_size * 2) //How many rods to fix these sections + +/obj/structure/fence + name = "fence" + desc = "A chain link fence. Not as effective as a wall, but generally it keeps people out." + density = TRUE + anchored = TRUE + + icon = 'icons/obj/fence.dmi' + icon_state = "straight" + + var/cuttable = TRUE + var/hole_size = NO_HOLE + var/invulnerable = FALSE + var/shock_cooldown = FALSE + +/obj/structure/fence/Initialize() + . = ..() + update_cut_status() + +/obj/structure/fence/examine(mob/user) + . = ..() + switch(hole_size) + if(MEDIUM_HOLE) + . += "There is a large hole in \the [src]." + if(LARGE_HOLE) + . += "\The [src] has been completely cut through." + +/obj/structure/fence/end + icon_state = "end" + cuttable = FALSE + +/obj/structure/fence/corner + icon_state = "corner" + cuttable = FALSE + +/obj/structure/fence/post + icon_state = "post" + cuttable = FALSE + +/obj/structure/fence/cut/medium + icon_state = "straight_cut2" + hole_size = MEDIUM_HOLE + climbable = TRUE + +/obj/structure/fence/cut/large + icon_state = "straight_cut3" + hole_size = LARGE_HOLE + +/obj/structure/fence/CanPass(atom/movable/mover, turf/target) + if(istype(mover) && mover.checkpass(PASSFENCE)) + return TRUE + if(istype(mover, /obj/item/projectile)) + return TRUE + if(!density) + return TRUE + return FALSE + +/* + Shock user with probability prb (if all connections & power are working) + Returns TRUE if shocked, FALSE otherwise + Totally not stolen from code\game\objects\structures\grille.dm +*/ +/obj/structure/fence/proc/shock(mob/user, prb) + if(!prob(prb)) + return FALSE + if(!in_range(src, user)) //To prevent TK and mech users from getting shocked + return FALSE + var/turf/T = get_turf(src) + var/obj/structure/cable/C = T.get_cable_node() + if(C) + if(electrocute_mob(user, C, src, 1, TRUE)) + do_sparks(3, 1, src) + return TRUE + return FALSE + +/obj/structure/fence/wirecutter_act(mob/living/user, obj/item/W) + . = TRUE + if(shock(user, 100)) + return + if(!cuttable) + to_chat(user, "This section of the fence can't be cut!") + return + if(invulnerable) + to_chat(user, "This fence is too strong to cut through!") + return + var/current_stage = hole_size + user.visible_message("\The [user] starts cutting through \the [src] with \the [W].",\ + "You start cutting through \the [src] with \the [W].") + if(W.use_tool(src, user, CUT_TIME * W.toolspeed, volume = W.tool_volume)) + if(current_stage == hole_size) + switch(hole_size) + if(NO_HOLE) + visible_message("\The [user] cuts into \the [src] some more.") + to_chat(user, "You could probably fit yourself through that hole now. Although climbing through would be much faster if you made it even bigger.") + hole_size = MEDIUM_HOLE + if(MEDIUM_HOLE) + visible_message("\The [user] completely cuts through \the [src].") + to_chat(user, "The hole in \the [src] is now big enough to walk through.") + hole_size = LARGE_HOLE + if(LARGE_HOLE) + visible_message("\The [user] completely dismantles \the [src].") + to_chat(user, "You completely take apart \the [src].") + qdel(src) + return + update_cut_status() + +/obj/structure/fence/attackby(obj/item/C, mob/user) + if(shock(user, 90)) + return + if(istype(C, /obj/item/stack/rods)) + if(hole_size == NO_HOLE) + return + var/obj/item/stack/rods/R = C + if(R.get_amount() < HOLE_REPAIR) + to_chat(user, "You need [HOLE_REPAIR] rods to fix this fence!") + return + to_chat(user, "You begin repairing the fence...") + if(do_after(user, 3 SECONDS * C.toolspeed, target = src) && hole_size != NO_HOLE && R.use(HOLE_REPAIR)) + playsound(src, C.usesound, 80, 1) + hole_size = NO_HOLE + obj_integrity = max_integrity + to_chat(user, "You repair the fence.") + update_cut_status() + return + . = ..() + +/obj/structure/fence/Bumped(atom/user) + if(!ismob(user)) + return + if(shock_cooldown) + return + shock(user, 70) + shock_cooldown = TRUE // We do not want bump shock spam! + addtimer(CALLBACK(src, .proc/shock_cooldown), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + +/obj/structure/fence/proc/shock_cooldown() + shock_cooldown = FALSE + +/obj/structure/fence/attack_animal(mob/user) + . = ..() + if(. && !QDELETED(src) && !shock(user, 70)) + take_damage(rand(5,10), BRUTE, "melee", 1) + +/obj/structure/fence/proc/update_cut_status() + if(!cuttable) + return + var/new_density = TRUE + switch(hole_size) + if(NO_HOLE) + icon_state = initial(icon_state) + climbable = FALSE + if(MEDIUM_HOLE) + icon_state = "straight_cut2" + climbable = TRUE + if(LARGE_HOLE) + icon_state = "straight_cut3" + new_density = FALSE + climbable = FALSE + set_density(new_density) + +//FENCE DOORS + +/obj/structure/fence/door + name = "fence door" + desc = "Not very useful without a real lock." + icon_state = "door_closed" + cuttable = FALSE + var/open = FALSE + +/obj/structure/fence/door/Initialize() + . = ..() + update_door_status() + +/obj/structure/fence/door/opened + icon_state = "door_opened" + open = TRUE + density = TRUE + +/obj/structure/fence/door/attack_hand(mob/user, list/modifiers) + shock(user, 70) + if(can_open(user)) + toggle(user) + return TRUE + +/obj/structure/fence/door/proc/toggle(mob/user) + open = !open + visible_message("\The [user] [open ? "opens" : "closes"] \the [src].") + update_door_status() + playsound(src, 'sound/machines/door_open.ogg', 100, TRUE) + +/obj/structure/fence/door/proc/update_door_status() + set_density(!open) + icon_state = open ? "door_opened" : "door_closed" + +/obj/structure/fence/door/proc/can_open(mob/user) + return TRUE + +#undef CUT_TIME +#undef CLIMB_TIME + +#undef NO_HOLE +#undef MEDIUM_HOLE +#undef LARGE_HOLE +#undef MAX_HOLE_SIZE +#undef HOLE_REPAIR diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm new file mode 100644 index 00000000000..2dc7a509206 --- /dev/null +++ b/code/game/objects/structures/railings.dm @@ -0,0 +1,136 @@ +/obj/structure/railing + name = "railing" + desc = "Basic railing meant to protect idiots like you from falling." + icon = 'icons/obj/fence.dmi' + icon_state = "railing" + density = TRUE + anchored = TRUE + pass_flags = LETPASSTHROW + climbable = TRUE + layer = ABOVE_MOB_LAYER + var/currently_climbed = FALSE + +/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch + icon_state = "railing_corner" + density = FALSE + climbable = FALSE + +/obj/structure/railing/attackby(obj/item/I, mob/living/user, params) + ..() + add_fingerprint(user) + +/obj/structure/railing/welder_act(mob/living/user, obj/item/I) + if(user.intent != INTENT_HELP) + return + if(obj_integrity >= max_integrity) + to_chat(user, "[src] is already in good condition!") + return + if(!I.tool_start_check(user, amount = 0)) + return + to_chat(user, "You begin repairing [src]...") + if(I.use_tool(src, user, 40, volume = 50)) + obj_integrity = max_integrity + to_chat(user, "You repair [src].") + +/obj/structure/railing/wirecutter_act(mob/living/user, obj/item/I) + if(anchored) + return + to_chat(user, "You cut apart the railing.") + I.play_tool_sound(src, 100) + deconstruct() + return TRUE + +/obj/structure/railing/deconstruct(disassembled) + if(!(flags & NODECONSTRUCT)) + var/obj/item/stack/rods/rod = new /obj/item/stack/rods(drop_location(), 3) + transfer_fingerprints_to(rod) + return ..() + +///Implements behaviour that makes it possible to unanchor the railing. +/obj/structure/railing/wrench_act(mob/living/user, obj/item/I) + if(flags & NODECONSTRUCT) + return + to_chat(user, "You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...") + if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) + anchored = !anchored + to_chat(user, "You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.") + return TRUE + +/obj/structure/railing/corner/CanPass() + return TRUE + +/obj/structure/railing/corner/CheckExit() + return TRUE + +/obj/structure/railing/CanPass(atom/movable/mover, turf/target) + if(istype(mover) && mover.checkpass(PASSFENCE)) + return TRUE + if(istype(mover, /obj/item/projectile)) + return TRUE + if(ismob(mover)) + var/mob/M = mover + if(M.flying) + return TRUE + if(mover.throwing) + return TRUE + if(get_dir(loc, target) != dir) + return density + return FALSE + +/obj/structure/railing/CheckExit(atom/movable/O, target) + var/mob/living/M = O + if(istype(O) && O.checkpass(PASSFENCE)) + return TRUE + if(istype(O, /obj/item/projectile)) + return TRUE + if(ismob(O)) + if(M.flying || M.floating) + return TRUE + if(O.throwing) + return TRUE + if(O.move_force >= MOVE_FORCE_EXTREMELY_STRONG) + return TRUE + if(currently_climbed) + return TRUE + if(get_dir(O.loc, target) == dir) + return FALSE + return TRUE + +/obj/structure/railing/do_climb(mob/living/user) + var/initial_mob_loc = get_turf(user) + . = ..() + if(.) + currently_climbed = TRUE + if(initial_mob_loc != get_turf(src)) // If we are on the railing, we want to move in the same dir as the railing. Otherwise we get put on the railing + currently_climbed = FALSE + return + user.Move(get_step(user, dir), TRUE) + currently_climbed = FALSE + +/obj/structure/railing/proc/can_be_rotated(mob/user) + if(anchored) + to_chat(user, "[src] cannot be rotated while it is fastened to the floor!") + return FALSE + + var/target_dir = turn(dir, -90) + + if(!valid_window_location(loc, target_dir)) //Expanded to include rails, as well! + to_chat(user, "[src] cannot be rotated in that direction!") + return FALSE + return TRUE + +/obj/structure/railing/proc/check_anchored(checked_anchored) + if(anchored == checked_anchored) + return TRUE + +/obj/structure/railing/proc/after_rotation(mob/user) + add_fingerprint(user) + +/obj/structure/railing/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + if(can_be_rotated(user)) + setDir(turn(dir, 90)) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 4266d6ef254..c373a28936c 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -368,7 +368,8 @@ GLOBAL_LIST_EMPTY(safes) /obj/structure/safe/floor/Initialize() . = ..() var/turf/T = loc - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) /obj/structure/safe/floor/hide(intact) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a2d13ad8afb..7872c395d1e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -27,6 +27,8 @@ var/real_explosion_block //ignore this, just use explosion_block var/breaksound = "shatter" var/hitsound = 'sound/effects/Glasshit.ogg' + /// Used to restore colours from polarised glass + var/old_color /obj/structure/window/examine(mob/user) . = ..() @@ -69,6 +71,17 @@ air_update_turf(TRUE) +/obj/structure/window/proc/toggle_polarization() + if(opacity) + if(!old_color) + old_color = "#FFFFFF" + animate(src, color = old_color, time = 0.5 SECONDS) + set_opacity(FALSE) + else + old_color = color + animate(src, color = "#222222", time = 0.5 SECONDS) + set_opacity(TRUE) + /obj/structure/window/narsie_act() color = NARSIE_WINDOW_COLOUR @@ -497,14 +510,6 @@ desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it." var/id -/obj/structure/window/reinforced/polarized/proc/toggle() - if(opacity) - animate(src, color="#FFFFFF", time=5) - set_opacity(0) - else - animate(src, color="#222222", time=5) - set_opacity(1) - /obj/machinery/button/windowtint name = "window tint control" icon = 'icons/obj/power.dmi' @@ -514,12 +519,35 @@ var/id = 0 var/active = 0 +/obj/machinery/button/windowtint/Initialize(mapload, w_dir = null) + . = ..() + switch(w_dir) + if(NORTH) + pixel_y = 25 + if(SOUTH) + pixel_y = -25 + if(EAST) + pixel_x = 25 + if(WEST) + pixel_x = -25 + /obj/machinery/button/windowtint/attack_hand(mob/user) if(..()) - return 1 + return TRUE toggle_tint() +/obj/machinery/button/windowtint/wrench_act(mob/user, obj/item/I) + . = TRUE + if(!I.tool_use_check(user, 0)) + return + user.visible_message("[user] starts unwrenching [src] from the wall...", "You are unwrenching [src] from the wall...", "You hear ratcheting.") + if(!I.use_tool(src, user, 50, volume = I.tool_volume)) + return + WRENCH_UNANCHOR_WALL_MESSAGE + new /obj/item/mounted/frame/light_switch/windowtint(get_turf(src)) + qdel(src) + /obj/machinery/button/windowtint/proc/toggle_tint() use_power(5) @@ -528,9 +556,11 @@ for(var/obj/structure/window/reinforced/polarized/W in range(src,range)) if(W.id == src.id || !W.id) - spawn(0) - W.toggle() - return + W.toggle_polarization() + + for(var/obj/structure/window/full/reinforced/polarized/W in range(src, range)) + if(W.id == id || !W.id) + W.toggle_polarization() /obj/machinery/button/windowtint/power_change() ..() @@ -589,7 +619,7 @@ icon_state = "window" max_integrity = 50 smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) /obj/structure/window/full/plasmabasic name = "plasma window" @@ -602,7 +632,7 @@ heat_resistance = 32000 max_integrity = 300 smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) explosion_block = 1 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) rad_insulation = RAD_NO_INSULATION @@ -616,7 +646,7 @@ shardtype = /obj/item/shard/plasma glass_type = /obj/item/stack/sheet/plasmarglass smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) reinf = TRUE max_integrity = 1000 explosion_block = 2 @@ -632,7 +662,7 @@ icon = 'icons/obj/smooth_structures/reinforced_window.dmi' icon_state = "r_window" smooth = SMOOTH_TRUE - canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) + canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/polarized, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass) max_integrity = 100 reinf = TRUE heat_resistance = 1600 @@ -641,6 +671,11 @@ explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass +/obj/structure/window/full/reinforced/polarized + name = "electrochromic window" + desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it." + var/id + /obj/structure/window/full/reinforced/tinted name = "tinted window" desc = "It looks rather strong and opaque. Might take a few good hits to shatter it." diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 24fcba648f2..8f8e94362b7 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -27,6 +27,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5") var/list/burnt_states = list("floorscorched1", "floorscorched2") var/list/prying_tool_list = list(TOOL_CROWBAR) //What tool/s can we use to pry up the tile? + var/keep_dir = TRUE //When false, resets dir to default on changeturf() var/footstep = FOOTSTEP_FLOOR var/barefootstep = FOOTSTEP_HARD_BAREFOOT @@ -124,11 +125,18 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama var/turf/simulated/floor/W = ..() + var/obj/machinery/atmospherics/R + if(keep_icon) W.icon_regular_floor = old_icon W.icon_plating = old_plating + if(W.keep_dir) W.dir = old_dir - + if(W.transparent_floor) + for(R in W) + R.update_icon() + for(R in W) + R.update_underlays() W.update_icon() return W diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index d0805cf5099..ad26fa8919e 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -70,6 +70,35 @@ to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.") return TRUE + else if(is_glass_sheet(C)) + if(broken || burnt) + to_chat(user, "Repair the plating first!") + return TRUE + var/obj/item/stack/sheet/R = C + if(R.get_amount() < 2) + to_chat(user, "You need two sheets to build a [C.name] floor!") + return TRUE + to_chat(user, "You begin swapping the plating for [C]...") + if(do_after(user, 3 SECONDS * C.toolspeed, target = src)) + if(R.get_amount() >= 2 && !transparent_floor) + if(istype(C, /obj/item/stack/sheet/plasmaglass)) //So, what type of glass floor do we want today? + ChangeTurf(/turf/simulated/floor/transparent/glass/plasma) + else if(istype(C, /obj/item/stack/sheet/plasmarglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced/plasma) + else if(istype(C, /obj/item/stack/sheet/glass)) + ChangeTurf(/turf/simulated/floor/transparent/glass) + else if(istype(C, /obj/item/stack/sheet/rglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/reinforced) + else if(istype(C, /obj/item/stack/sheet/titaniumglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/titanium) + else if(istype(C, /obj/item/stack/sheet/plastitaniumglass)) + ChangeTurf(/turf/simulated/floor/transparent/glass/titanium/plasma) + playsound(src, C.usesound, 80, TRUE) + R.use(2) + to_chat(user, "You swap the plating for [C].") + new /obj/item/stack/sheet/metal(src, 2) + return TRUE + /turf/simulated/floor/plating/screwdriver_act(mob/user, obj/item/I) . = TRUE if(!I.tool_use_check(user, 0)) diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm new file mode 100644 index 00000000000..81030c4d294 --- /dev/null +++ b/code/game/turfs/simulated/floor/transparent.dm @@ -0,0 +1,112 @@ +/turf/simulated/floor/transparent/glass + name = "glass floor" + desc = "Don't jump on it... Or do, I'm not your mom." + icon = 'icons/turf/floors/glass.dmi' + icon_state = "unsmooth" + baseturf = /turf/space + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/simulated/floor/transparent/glass, /turf/simulated/floor/transparent/glass/reinforced, /turf/simulated/floor/transparent/glass/plasma, /turf/simulated/floor/transparent/glass/reinforced/plasma) + footstep = FOOTSTEP_GLASS + barefootstep = FOOTSTEP_GLASS_BAREFOOT + clawfootstep = FOOTSTEP_GLASS_BAREFOOT + heavyfootstep = FOOTSTEP_GLASS_BAREFOOT + light_power = 0.25 + light_range = 2 + layer = TRANSPARENT_TURF_LAYER + keep_dir = FALSE + intact = FALSE + transparent_floor = TRUE + heat_capacity = 800 + +/turf/simulated/floor/transparent/glass/Initialize(mapload) + . = ..() + var/image/I = image('icons/turf/space.dmi', src, SPACE_ICON_STATE) + I.plane = PLANE_SPACE + underlays += I + dir = SOUTH //dirs that are not 2/south cause smoothing jank + icon_state = "" //Prevents default icon appearing behind the glass + +/turf/simulated/floor/transparent/glass/welder_act(mob/user, obj/item/I) + if(!broken && !burnt) + return + if(!I.tool_use_check(user, 0)) + return + if(I.use_tool(src, user, volume = I.tool_volume)) + to_chat(user, "You fix some cracks in the glass.") + overlays -= current_overlay + current_overlay = null + burnt = FALSE + broken = FALSE + update_icon() + +/turf/simulated/floor/transparent/glass/crowbar_act(mob/user, obj/item/I) + if(!I || !user) + return + var/obj/item/stack/R = user.get_inactive_hand() + if(istype(R, /obj/item/stack/sheet/metal)) + if(R.get_amount() < 2) //not enough metal in the stack + to_chat(user, "You also need to hold two sheets of metal to dismantle [src]!") + return + else + to_chat(user, "You begin replacing [src]...") + playsound(src, I.usesound, 80, TRUE) + if(do_after(user, 3 SECONDS * I.toolspeed, target = src)) + if(R.get_amount() < 2 || !transparent_floor) + return + else //not holding metal at all + to_chat(user, "You also need to hold two sheets of metal to dismantle \the [src]!") + return + switch(type) //What material is returned? Depends on the turf + if(/turf/simulated/floor/transparent/glass/reinforced) + new /obj/item/stack/sheet/rglass(src, 2) + if(/turf/simulated/floor/transparent/glass) + new /obj/item/stack/sheet/glass(src, 2) + if(/turf/simulated/floor/transparent/glass/plasma) + new /obj/item/stack/sheet/plasmaglass(src, 2) + if(/turf/simulated/floor/transparent/glass/reinforced/plasma) + new /obj/item/stack/sheet/plasmarglass(src, 2) + if(/turf/simulated/floor/transparent/glass/titanium) + new /obj/item/stack/sheet/titaniumglass(src, 2) + if(/turf/simulated/floor/transparent/glass/titanium/plasma) + new /obj/item/stack/sheet/plastitaniumglass(src, 2) + R.use(2) + playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE) + ChangeTurf(/turf/simulated/floor/plating) + + +/turf/simulated/floor/transparent/glass/reinforced + name = "reinforced glass floor" + desc = "Jump on it, it can cope. Promise..." + icon = 'icons/turf/floors/reinf_glass.dmi' + thermal_conductivity = 0.035 + heat_capacity = 1600 + +/turf/simulated/floor/transparent/glass/reinforced/acid_act(acidpwr, acid_volume) + acidpwr = min(acidpwr, 50) + . = ..() + +/turf/simulated/floor/transparent/glass/plasma + name = "plasma glass floor" + desc = "Wait, was space always that color?" + icon = 'icons/turf/floors/plasmaglass.dmi' + thermal_conductivity = 0.030 + heat_capacity = 32000 + +/turf/simulated/floor/transparent/glass/reinforced/plasma + name = "reinforced plasma glass floor" + desc = "For when you REALLY don't want your floor choice to suffocate everyone." + icon = 'icons/turf/floors/reinf_plasmaglass.dmi' + thermal_conductivity = 0.025 + heat_capacity = 325000 + +/turf/simulated/floor/transparent/glass/titanium + name = "titanium glass floor" + desc = "Stylish AND strong!" + icon = 'icons/turf/floors/titaniumglass.dmi' + canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plasma) + thermal_conductivity = 0.025 + heat_capacity = 1600 + +/turf/simulated/floor/transparent/glass/titanium/plasma + name = "plastitanium glass floor" + icon = 'icons/turf/floors/plastitaniumglass.dmi' diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 938e2f8a851..8c64a8456bf 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -6,6 +6,7 @@ var/intact = TRUE var/turf/baseturf = /turf/space var/slowdown = 0 //negative for faster, positive for slower + var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not ///Properties for open tiles (/floor) /// All the gas vars, on the turf, are meant to be utilized for initializing a gas datum and setting its first gas values; the turf vars are never further modified at runtime; it is never directly used for calculations by the atmospherics system. diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 458f06e9c19..162e1ebd26e 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") if(!GLOB.dooc_enabled && (mob.stat == DEAD)) to_chat(usr, "OOC for dead mobs has been turned off.") return - if(prefs.muted & MUTE_OOC) + if(check_mute(ckey, MUTE_OOC)) to_chat(src, "You cannot use OOC (muted).") return @@ -181,7 +181,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") if(!GLOB.dooc_enabled && (mob.stat == DEAD)) to_chat(usr, "LOOC for dead mobs has been turned off.") return - if(prefs.muted & MUTE_OOC) + if(check_mute(ckey, MUTE_OOC)) to_chat(src, "You cannot use LOOC (muted).") return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 85d4be92516..5e1d4036171 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -122,7 +122,6 @@ GLOBAL_VAR_INIT(nologevent, 0) if(M.ckey) body += "Kick | " - body += "Warn | " body += "Ban | " body += "Jobban | " body += "Appearance Ban | " @@ -141,14 +140,13 @@ GLOBAL_VAR_INIT(nologevent, 0) body += "\ Send back to Lobby | " body += "\ Erase Flavor Text | " body += "\ Use Random Name | " - var/muted = M.client.prefs.muted body += {"
Mute: - \[IC | - OOC | - PRAY | - ADMINHELP | - DEADCHAT\] - (toggle all) + \[IC | + OOC | + PRAY | + ADMINHELP | + DEADCHAT] + (toggle all) "} var/jumptoeye = "" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index de44ccd4788..5ddf090f101 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -492,51 +492,6 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( log_admin("[key_name(usr)] has turned BB mode [holder.fakekey ? "ON" : "OFF"]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Big Brother Mode") -#define MAX_WARNS 3 -#define AUTOBANTIME 10 - -/client/proc/warn(warned_ckey) - if(!check_rights(R_ADMIN)) - return - - if(!warned_ckey || !istext(warned_ckey)) return - if(warned_ckey in GLOB.admin_datums) - to_chat(usr, "Error: warn(): You can't warn admins.") - return - - var/datum/preferences/D - var/client/C = GLOB.directory[warned_ckey] - if(C) D = C.prefs - else D = GLOB.preferences_datums[warned_ckey] - - if(!D) - to_chat(src, "Error: warn(): No such ckey found.") - return - - if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) - if(C) - message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban") - log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban") - to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") - qdel(C) - else - message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban") - log_admin("[key_name(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban") - AddBan(warned_ckey, D.last_id, "Autobanning due to too many formal warnings", ckey, 1, AUTOBANTIME) - else - if(C) - to_chat(C, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") - message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") - log_admin("[key_name(src)] has warned [key_name(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") - else - message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.") - log_admin("[key_name(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.") - - SSblackbox.record_feedback("tally", "admin_verb", 1, "Warning") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -#undef MAX_WARNS -#undef AUTOBANTIME - /client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE set category = "Event" set name = "Drop Bomb" diff --git a/code/modules/admin/mute.dm b/code/modules/admin/mute.dm new file mode 100644 index 00000000000..cab33a4edda --- /dev/null +++ b/code/modules/admin/mute.dm @@ -0,0 +1,32 @@ +/// Associative list of people who are muted via admin mutes +GLOBAL_LIST_EMPTY(admin_mutes_assoc) + +/proc/check_mute(ckey, muteflag) + if(isnull(GLOB.admin_mutes_assoc[ckey])) + return FALSE + + if(GLOB.admin_mutes_assoc[ckey] & muteflag) + return TRUE + return FALSE + +/proc/toggle_mute(ckey, muteflag) + if(isnull(GLOB.admin_mutes_assoc[ckey])) + GLOB.admin_mutes_assoc[ckey] = 0 + + if(GLOB.admin_mutes_assoc[ckey] & muteflag) + GLOB.admin_mutes_assoc[ckey] &= ~muteflag + else + GLOB.admin_mutes_assoc[ckey] |= muteflag + +/proc/force_add_mute(ckey, muteflag) + if(isnull(GLOB.admin_mutes_assoc[ckey])) + GLOB.admin_mutes_assoc[ckey] = 0 + + GLOB.admin_mutes_assoc[ckey] |= muteflag + +/proc/force_remove_mute(ckey, muteflag) + if(isnull(GLOB.admin_mutes_assoc[ckey])) + GLOB.admin_mutes_assoc[ckey] = 0 + + GLOB.admin_mutes_assoc[ckey] &= ~muteflag + diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e1e31544d3e..d9510a4defb 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -446,9 +446,6 @@ alert(usr, "This ban has already been lifted / does not exist.", "Error", "Ok") unbanpanel() - else if(href_list["warn"]) - usr.client.warn(href_list["warn"]) - else if(href_list["unbane"]) if(!check_rights(R_BAN)) return diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index e206f345c0c..3db301985ed 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown", "the", "a", "an", "of" set name = "Adminhelp" //handle muting and automuting - if(prefs.muted & MUTE_ADMINHELP) + if(check_mute(ckey, MUTE_ADMINHELP)) to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") return diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 7186406e7fa..348d5690ecd 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -58,7 +58,7 @@ //takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM. //Fetching a message if needed. src is the sender and C is the target client /client/proc/cmd_admin_pm(whom, msg, type = "PM") - if(prefs.muted & MUTE_ADMINHELP) + if(check_mute(ckey, MUTE_ADMINHELP)) to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") return @@ -212,7 +212,7 @@ return /client/proc/cmd_admin_discord_pm() - if(prefs.muted & MUTE_ADMINHELP) + if(check_mute(ckey, MUTE_ADMINHELP)) to_chat(src, "Error: Private-Message: You are unable to use PMs (muted).") return diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index be4a4763bff..4005d9b7435 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -43,6 +43,7 @@ msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN)) log_mentorsay(msg, src) + mob.create_log(OOC_LOG, "MSAY: [msg]") if(!msg) return diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index c3ab3bfe47f..410956c9d2a 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -9,7 +9,7 @@ if(!src.mob) return - if(prefs.muted & MUTE_DEADCHAT) + if(check_mute(ckey, MUTE_DEADCHAT)) to_chat(src, "You cannot send DSAY messages (muted).") return diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 8055c5e7a03..93aaf292332 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -1,3 +1,7 @@ +#define NUKE_INTACT 0 +#define NUKE_CORE_MISSING 1 +#define NUKE_MISSING 2 + /mob/living/verb/pray(msg as text) set category = "IC" set name = "Pray" @@ -7,7 +11,7 @@ return if(usr.client) - if(usr.client.prefs.muted & MUTE_PRAY) + if(check_mute(client.ckey, MUTE_PRAY)) to_chat(usr, "You cannot pray (muted).") return if(client.handle_spam_prevention(msg, MUTE_PRAY, OOC_COOLDOWN)) @@ -72,11 +76,21 @@ /proc/Nuke_request(text , mob/Sender) var/nuke_code = get_nuke_code() + var/nuke_status = get_nuke_status() var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "NUKE CODE REQUEST: [key_name(Sender)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) ([ADMIN_CENTCOM_REPLY(Sender,"RPLY")]): [msg]" for(var/client/X in GLOB.admins) if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) - to_chat(X, "The nuke code is [nuke_code].") + if(nuke_status == NUKE_MISSING) + to_chat(X, "The nuclear device is not on station!") + else + to_chat(X, "The nuke code is [nuke_code].") + if(nuke_status == NUKE_CORE_MISSING) + to_chat(X, "The nuclear device does not have a core, and will not arm!") if(X.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) + +#undef NUKE_INTACT +#undef NUKE_CORE_MISSING +#undef NUKE_MISSING diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 81be8843152..b12d3de9963 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -230,19 +230,19 @@ if(automute) muteunmute = "auto-muted" - M.client.prefs.muted |= mute_type + force_add_mute(M.client.ckey, mute_type) log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]") message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1) to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Automute") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return - if(M.client.prefs.muted & mute_type) - muteunmute = "unmuted" - M.client.prefs.muted &= ~mute_type - else + toggle_mute(M.client.ckey, mute_type) + + if(check_mute(M.client.ckey, mute_type)) muteunmute = "muted" - M.client.prefs.muted |= mute_type + else + muteunmute = "unmuted" log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]") message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1) @@ -606,7 +606,7 @@ Traitors and the like can also be revived with the previous role mostly intact. "Custom" = "Cryptic Message") var/list/MsgSound = list("Beep" = 'sound/misc/notice2.ogg', - "Enemy Communications Intercepted" = 'sound/AI/intercept2.ogg', + "Enemy Communications Intercepted" = 'sound/AI/intercept.ogg', "New Command Report Created" = 'sound/AI/commandreport.ogg') var/type = input(usr, "Pick a type of report to send", "Report Type", "") as anything in MsgType diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index 92e6336d693..99efbc811f4 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -25,9 +25,6 @@ H.dna.SetSEState(GLOB.hulkblock, TRUE) singlemutcheck(H, GLOB.hulkblock, MUTCHK_FORCED) - H.dna.SetSEState(GLOB.xrayblock, TRUE) - singlemutcheck(H, GLOB.xrayblock, MUTCHK_FORCED) - H.dna.SetSEState(GLOB.fireblock, TRUE) singlemutcheck(H, GLOB.fireblock, MUTCHK_FORCED) diff --git a/code/modules/arcade/mob_hunt/mob_avatar.dm b/code/modules/arcade/mob_hunt/mob_avatar.dm index 7f7f53d3199..19f792af763 100644 --- a/code/modules/arcade/mob_hunt/mob_avatar.dm +++ b/code/modules/arcade/mob_hunt/mob_avatar.dm @@ -1,4 +1,3 @@ - /obj/effect/nanomob name = "Nano-Mob Avatar" //will be overridden by the mob datum name value when created desc = "A wild Nano-Mob appeared! Hit it with your PDA with the game open to attempt to capture it!" @@ -12,17 +11,29 @@ var/list/clients_encountered = list() //tracks who has already interacted with us, so they can't attempt a second capture var/image/avatar -/obj/effect/nanomob/New(loc, datum/mob_hunt/new_info) - ..() +/obj/effect/nanomob/Initialize(mapload, datum/mob_hunt/new_info) + . = ..() if(!new_info) - qdel(src) - return + return INITIALIZE_HINT_QDEL mob_info = new_info + RegisterSignal(mob_info, COMSIG_PARENT_QDELETING, .proc/delete_wrapper) update_self() forceMove(mob_info.spawn_point) if(!mob_info.is_trap) addtimer(CALLBACK(src, .proc/despawn), mob_info.lifetime) +/obj/effect/nanomob/Destroy() + SSmob_hunt.trap_spawns -= src + SSmob_hunt.normal_spawns -= src + mob_info = null // Can't delete this since multiple players can get the exact same /datum/mob_hunt. (This should be refactored) + clients_encountered.Cut() + QDEL_NULL(avatar) + return ..() + +/obj/effect/nanomob/proc/delete_wrapper() + SIGNAL_HANDLER + qdel(src) + /obj/effect/nanomob/proc/update_self() if(!mob_info) return @@ -132,12 +143,6 @@ icon_state = "placeholder" var/obj/machinery/computer/mob_battle_terminal/my_terminal -/obj/effect/nanomob/battle/New(loc, datum/mob_hunt/new_info) - . = ..() - if(new_info) - mob_info = new_info - update_self() - /obj/effect/nanomob/battle/update_self() if(!mob_info) name = "Nano-Mob Battle Avatar" diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index d1efa862a63..cd83952fcae 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -215,7 +215,7 @@ var/life_cycles = 0 var/life_cap = 20 anchored = TRUE - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE /obj/effect/beam/i_beam/proc/hit() diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index bb255692633..8cf6e965e62 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -71,10 +71,13 @@ Pipelines + Other Objects -> Pipe network // Icons/overlays/underlays /obj/machinery/atmospherics/update_icon() var/turf/T = get_turf(loc) - if(!T || level == 2 || !T.intact) - plane = GAME_PLANE - else + if(T && T.transparent_floor) plane = FLOOR_PLANE + else + if(!T || level == 2 || !T.intact) + plane = GAME_PLANE + else + plane = FLOOR_PLANE /obj/machinery/atmospherics/proc/update_pipe_image() pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view) @@ -95,15 +98,18 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/add_underlay(turf/T, obj/machinery/atmospherics/node, direction, icon_connect_type) if(node) - if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe)) + if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe) && !T.transparent_floor) //underlays += SSair.icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node)) underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type) else //underlays += SSair.icon_manager.get_atmos_icon("underlay_intact", direction, color_cache_name(node)) underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type) else - //underlays += SSair.icon_manager.get_atmos_icon("underlay_exposed", direction, pipe_color) - underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type) + if(T.transparent_floor) //we want to keep pipes under transparent floors connected normally + underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type) + else + //underlays += SSair.icon_manager.get_atmos_icon("underlay_exposed", direction, pipe_color) + underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type) /obj/machinery/atmospherics/proc/update_underlays() if(check_icon_cache()) @@ -166,11 +172,14 @@ Pipelines + Other Objects -> Pipe network //(De)construction /obj/machinery/atmospherics/attackby(obj/item/W, mob/user) + var/turf/T = get_turf(src) if(can_unwrench && istype(W, /obj/item/wrench)) - var/turf/T = get_turf(src) + if(T.transparent_floor && istype(src, /obj/machinery/atmospherics/pipe) && layer != GAS_PIPE_VISIBLE_LAYER) //pipes on GAS_PIPE_VISIBLE_LAYER are above the transparent floor and should be interactable + to_chat(user, "You can't interact with something that's under the floor!") + return if(level == 1 && isturf(T) && T.intact) to_chat(user, "You must remove the plating first.") - return 1 + return var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() add_fingerprint(user) @@ -184,14 +193,14 @@ Pipelines + Other Objects -> Pipe network playsound(src.loc, W.usesound, 50, 1) to_chat(user, "You begin to unfasten \the [src]...") if(internal_pressure > 2*ONE_ATMOSPHERE) - to_chat(user, "As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?") + to_chat(user, "As you begin unwrenching \the [src] a gust of air blows in your face... maybe you should reconsider?") unsafe_wrenching = TRUE //Oh dear oh dear if(do_after(user, 40 * W.toolspeed, target = src) && !QDELETED(src)) user.visible_message( \ "[user] unfastens \the [src].", \ "You have unfastened \the [src].", \ - "You hear ratchet.") + "You hear ratcheting.") investigate_log("was REMOVED by [key_name(usr)]", "atmos") for(var/obj/item/clothing/shoes/magboots/usermagboots in user.get_equipped_items()) @@ -206,6 +215,9 @@ Pipelines + Other Objects -> Pipe network unsafe_pressure_release(user,internal_pressure) deconstruct(TRUE) else + if(T.transparent_floor) + to_chat(user, "You can't interact with something that's under the floor!") + return TRUE return ..() //Called when an atmospherics object is unwrenched while having a large pressure difference @@ -240,7 +252,12 @@ Pipelines + Other Objects -> Pipe network dir = D initialize_directions = P var/turf/T = loc - level = T.intact ? 2 : 1 + if(!T.transparent_floor) + level = T.intact ? 2 : 1 + else + level = 2 + plane = GAME_PLANE + layer = GAS_PIPE_VISIBLE_LAYER add_fingerprint(usr) if(!SSair.initialized) //If there's no atmos subsystem, we can't really initialize pipenets SSair.machinery_to_construct.Add(src) @@ -337,12 +354,15 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/add_underlay_adapter(turf/T, obj/machinery/atmospherics/node, direction, icon_connect_type) //modified from add_underlay, does not make exposed underlays if(node) - if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe)) + if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe) && !T.transparent_floor) underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type) else underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type) else - underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "retracted" + icon_connect_type) + if(T.transparent_floor) //we want to keep pipes under transparent floors connected normally + underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type) + else + underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "retracted" + icon_connect_type) /obj/machinery/atmospherics/singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 3943bde9a1d..8a5743da3d3 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -144,7 +144,7 @@ if(!istype(L) || L.buckled) return if(L.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, "Subject may not hold anything in their hands.") return if(L.has_buckled_mobs()) //mob attached to us to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") @@ -462,7 +462,7 @@ to_chat(usr, "The cryo cell is already occupied!") return if(M.abiotic()) - to_chat(usr, "Subject may not have abiotic items on.") + to_chat(usr, "Subject may not hold anything in their hands.") return if(!node) to_chat(usr, "The cell is not correctly connected to its pipe network!") diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm index 9859058d731..94f9f17e4b5 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm @@ -2,6 +2,7 @@ icon = 'icons/atmos/vent_pump.dmi' icon_state = "map_vent" plane = FLOOR_PLANE + layer = GAS_SCRUBBER_LAYER name = "passive vent" desc = "A large air vent" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index 1cfb4d18eb1..ed0c438008a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/unary/tank icon = 'icons/atmos/tank.dmi' icon_state = "air_map" - + layer = GAS_PIPE_VISIBLE_LAYER name = "pressure tank" desc = "A large vessel containing pressurized gas." diff --git a/code/modules/atmospherics/machinery/datum_icon_manager.dm b/code/modules/atmospherics/machinery/datum_icon_manager.dm index 2e0ef593bae..f7a345a7c9a 100644 --- a/code/modules/atmospherics/machinery/datum_icon_manager.dm +++ b/code/modules/atmospherics/machinery/datum_icon_manager.dm @@ -159,9 +159,9 @@ var/cache_name = state for(var/D in GLOB.cardinal) - var/image/I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)) + var/image/I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D), layer = GAS_PIPE_HIDDEN_LAYER) underlays[cache_name + "[D]"] = I for(var/pipe_color in GLOB.pipe_colors) - I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)) + I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D), layer = GAS_PIPE_HIDDEN_LAYER) I.color = GLOB.pipe_colors[pipe_color] underlays[state + "[D]" + "[GLOB.pipe_colors[pipe_color]]"] = I diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm index 615075cf3c0..4cfa2efb450 100644 --- a/code/modules/atmospherics/machinery/pipes/cap.dm +++ b/code/modules/atmospherics/machinery/pipes/cap.dm @@ -79,7 +79,8 @@ break var/turf/T = get_turf(src) // hide if turf is not intact - if(!istype(T)) return + if(!istype(T) || T.transparent_floor) + return hide(T.intact) update_icon() diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index ffb66a01da3..20dd2990888 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -57,6 +57,8 @@ node3 = target break var/turf/T = src.loc // hide if turf is not intact + if(T.transparent_floor) + return hide(T.intact) update_icon() diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index 80d18bcee0f..5cefc6f723c 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -165,7 +165,8 @@ break var/turf/T = src.loc // hide if turf is not intact - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) update_icon() /obj/machinery/atmospherics/pipe/manifold4w/visible diff --git a/code/modules/atmospherics/machinery/pipes/pipe.dm b/code/modules/atmospherics/machinery/pipes/pipe.dm index afda1c30db7..925bf48715d 100644 --- a/code/modules/atmospherics/machinery/pipes/pipe.dm +++ b/code/modules/atmospherics/machinery/pipes/pipe.dm @@ -46,10 +46,6 @@ if(istype(W, /obj/item/analyzer)) atmosanalyzer_scan(parent.air, user) return - - if(istype(W, /obj/item/painter)) - return - return ..() /obj/machinery/atmospherics/proc/pipeline_expansion() diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm index 92c421fbff9..7e14946e61e 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm @@ -68,7 +68,8 @@ break var/turf/T = loc // hide if turf is not intact - hide(T.intact) + if(!T.transparent_floor) + hide(T.intact) update_icon() /obj/machinery/atmospherics/pipe/simple/check_pressure(pressure) diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 2377deca844..511fbb92294 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -79,8 +79,6 @@ ADD_TRAIT(user, TRAIT_LASEREYES, "ww_wishgranter") user.dna.SetSEState(GLOB.fireblock, TRUE) singlemutcheck(user, GLOB.fireblock, MUTCHK_FORCED) - user.dna.SetSEState(GLOB.xrayblock, TRUE) - singlemutcheck(user, GLOB.xrayblock, MUTCHK_FORCED) if(ishuman(user)) var/mob/living/carbon/human/human = user if(!isshadowperson(human)) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 8c7dc4963f6..8a07b9fe4d0 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -8,8 +8,8 @@ #define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen? #define MIN_CLIENT_VERSION 513 // Minimum byond major version required to play. //I would just like the code ready should it ever need to be used. -#define SUGGESTED_CLIENT_VERSION 513 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 -#define SUGGESTED_CLIENT_BUILD 1542 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 +#define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1542 +#define SUGGESTED_CLIENT_BUILD 1566 // only integers (e.g: 1542, 1543) are useful here. This is the part AFTER the ".", IE 1542 out of 513.1542 #define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s @@ -113,7 +113,7 @@ if(!holder && received_discord_pm < world.time - 6000) // Worse they can do is spam discord for 10 minutes to_chat(usr, "You are no longer able to use this, it's been more then 10 minutes since an admin on Discord has responded to you") return - if(prefs.muted & MUTE_ADMINHELP) + if(check_mute(ckey, MUTE_ADMINHELP)) to_chat(usr, "You cannot use this as your client has been muted from sending messages to the admins on Discord") return cmd_admin_discord_pm() diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 1979be243fa..b4688cb73b4 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -71,8 +71,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts var/max_gear_slots = 0 //non-preference stuff - var/warns = 0 - var/muted = 0 var/last_ip var/last_id diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index 2bb7b7529e2..21c81287a2b 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -356,3 +356,11 @@ prefs.toggles2 ^= PREFTOGGLE_2_SIMPLE_STAT_PANEL prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_SIMPLE_STAT_PANEL) ? "no longer" : "now"] get detailed information on the status panel.") + +/client/verb/toggle_item_outlines() + set name = "Toggle Item Outlines" + set category = "Preferences" + set desc = "Toggles seeing item outlines on hover." + prefs.toggles2 ^= PREFTOGGLE_2_SEE_ITEM_OUTLINES + prefs.save_preferences(src) + to_chat(usr, "You will [(prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES) ? "now" : "no longer"] see item outlines on hover.") diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 791802f0251..501ed9cdd61 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -52,6 +52,7 @@ visible_message("[src]'s light fades and turns off.") /obj/item/clothing/head/hardhat/orange + name = "orange hard hat" icon_state = "hardhat0_orange" item_state = "hardhat0_orange" item_color = "orange" @@ -69,6 +70,7 @@ dog_fashion = /datum/dog_fashion/head/hardhat/red /obj/item/clothing/head/hardhat/white + name = "white hard hat" icon_state = "hardhat0_white" item_state = "hardhat0_white" item_color = "white" @@ -80,6 +82,7 @@ dog_fashion = /datum/dog_fashion/head/hardhat/white /obj/item/clothing/head/hardhat/dblue + name = "blue hard hat" icon_state = "hardhat0_dblue" item_state = "hardhat0_dblue" item_color = "dblue" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e7e6d98b5b9..28e89708b6b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -171,7 +171,7 @@ icon_state = "beret_med" /obj/item/clothing/head/surgery - name = "surgical cap" + name = "blue surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" flags = BLOCKHEADHAIR @@ -180,16 +180,19 @@ ) /obj/item/clothing/head/surgery/purple + name = "purple surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple." icon_state = "surgcap_purple" dog_fashion = /datum/dog_fashion/head/surgery /obj/item/clothing/head/surgery/blue + name = "blue surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue." icon_state = "surgcap_blue" dog_fashion = /datum/dog_fashion/head/surgery /obj/item/clothing/head/surgery/green + name = "green surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green." icon_state = "surgcap_green" dog_fashion = /datum/dog_fashion/head/surgery diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index ffd730d7a6d..69f3dd39176 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -135,19 +135,19 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/blue - name = "medical scrubs" + name = "blue medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" item_color = "scrubsblue" /obj/item/clothing/under/rank/medical/green - name = "medical scrubs" + name = "green medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" item_color = "scrubsgreen" /obj/item/clothing/under/rank/medical/purple - name = "medical scrubs" + name = "purple medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." icon_state = "scrubspurple" item_color = "scrubspurple" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 6908a405a88..44c069b1bfd 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -62,6 +62,7 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) /obj/item/clothing/under/rank/security/corp + name = "corporate security jumpsuit" icon_state = "sec_corporate" item_state = "sec_corporate" item_color = "sec_corporate" diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index c806fac3ce0..a97abdd8e5a 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -5,6 +5,13 @@ /datum/event/anomaly/proc/findEventArea() var/static/list/allowed_areas + var/static/list/existing_areas + if(!existing_areas) + existing_areas = list() + for(var/area/AR in world) + var/turf/picked = safepick(get_area_turfs(AR.type)) + if(picked && is_station_level(picked.z)) + existing_areas += AR if(!allowed_areas) //Places that shouldn't explode var/list/safe_area_types = typecacheof(list( @@ -20,10 +27,16 @@ ) //Subtypes from the above that actually should explode. - var/list/unsafe_area_subtypes = typecacheof(list(/area/engine/break_room)) + var/list/unsafe_area_subtypes = typecacheof(list( + /area/engine/break_room, + /area/engine/equipmentstorage, + /area/engine/chiefs_office, + /area/engine/controlroom, + /area/engine/mechanic_workshop + )) - allowed_areas = make_associative(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes - var/list/possible_areas = typecache_filter_list(GLOB.all_areas, allowed_areas) + allowed_areas = typecacheof(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes + var/list/possible_areas = typecache_filter_list(existing_areas, allowed_areas) if(length(possible_areas)) return pick(possible_areas) @@ -36,7 +49,7 @@ CRASH("Anomaly: No valid turfs found for [impact_area] - [impact_area.type]") /datum/event/anomaly/announce() - GLOB.event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly_flux.ogg') /datum/event/anomaly/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index b90e8b86b01..67a559f97bd 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -5,4 +5,4 @@ anomaly_path = /obj/effect/anomaly/bluespace /datum/event/anomaly/anomaly_bluespace/announce() - GLOB.event_announcement.Announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly_bluespace.ogg') diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index 350e21cb496..2635185faa1 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -5,4 +5,4 @@ anomaly_path = /obj/effect/anomaly/flux /datum/event/anomaly/anomaly_flux/announce() - GLOB.event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly_flux.ogg') diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm index 4acf530c081..1009e12fed2 100644 --- a/code/modules/events/anomaly_grav.dm +++ b/code/modules/events/anomaly_grav.dm @@ -5,4 +5,4 @@ anomaly_path = /obj/effect/anomaly/grav /datum/event/anomaly/anomaly_grav/announce() - GLOB.event_announcement.Announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly_gravity.ogg') diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index 2caa8dc4a0c..5c29ba1c4b7 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -5,4 +5,4 @@ anomaly_path = /obj/effect/anomaly/pyro /datum/event/anomaly/anomaly_pyro/announce() - GLOB.event_announcement.Announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly_pyro.ogg') diff --git a/code/modules/events/anomaly_vortex.dm b/code/modules/events/anomaly_vortex.dm index 76058cfa574..a3bf8938d57 100644 --- a/code/modules/events/anomaly_vortex.dm +++ b/code/modules/events/anomaly_vortex.dm @@ -5,4 +5,4 @@ anomaly_path = /obj/effect/anomaly/bhole /datum/event/anomaly/anomaly_vortex/announce() - GLOB.event_announcement.Announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert") + GLOB.event_announcement.Announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert", 'sound/AI/anomaly_vortex.ogg') diff --git a/code/modules/events/apc_overload.dm b/code/modules/events/apc_overload.dm index 4e2a296dda5..e1784ae9726 100644 --- a/code/modules/events/apc_overload.dm +++ b/code/modules/events/apc_overload.dm @@ -21,7 +21,7 @@ SEND_SOUND(M, S) /datum/event/apc_overload/announce() - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", 'sound/AI/power_overload.ogg') /datum/event/apc_overload/end() return TRUE @@ -33,7 +33,7 @@ /area/turret_protected/ai) if(announce) - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", new_sound = 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please check all underfloor APC terminals.", "Critical Power Failure", 'sound/AI/power_overload.ogg') // break APC_BREAK_PROBABILITY% of all of the APCs on the station var/affected_apc_count = 0 diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm index 759b443e2bf..9c29b96a0f1 100644 --- a/code/modules/events/apc_short.dm +++ b/code/modules/events/apc_short.dm @@ -20,7 +20,7 @@ SEND_SOUND(M, S) /datum/event/apc_short/announce() - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", 'sound/AI/power_overload.ogg') /datum/event/apc_short/end() return TRUE @@ -30,7 +30,7 @@ /area/engine/engineering, /area/engine/supermatter, /area/turret_protected/ai) - GLOB.event_announcement.Announce("Power failure detected in [station_name()]'s powernet. All APCs have lost power. Gravity systems likely to fail.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("Power failure detected in [station_name()]'s powernet. All APCs have lost power. Gravity systems likely to fail.", "Systems Power Failure", 'sound/AI/attention.ogg') for(var/thing in GLOB.apcs) var/obj/machinery/power/apc/A = thing var/area/current_area = get_area(A) @@ -49,7 +49,7 @@ /area/engine/supermatter, /area/turret_protected/ai) if(announce) - GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", 'sound/AI/power_overload.ogg') // break APC_BREAK_PROBABILITY% of all of the APCs on the station var/affected_apc_count = 0 for(var/thing in GLOB.apcs) @@ -76,7 +76,7 @@ /proc/power_restore(announce = TRUE, power_type) if(power_type == 0) //Power without Repairing if(announce) - GLOB.event_announcement.Announce("All operational APCs on \the [station_name()] have been fully charged.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg') + GLOB.event_announcement.Announce("All operational APCs on \the [station_name()] have been fully charged.", "Power Systems Nominal", 'sound/AI/power_restore.ogg') var/affected_apc_count = 0 for(var/thing in GLOB.apcs) var/obj/machinery/power/apc/A = thing @@ -90,7 +90,7 @@ log_and_message_admins("Power has been restored to [affected_apc_count] APCs.") if(power_type == 1) //Repair without charging if(announce) - GLOB.event_announcement.Announce("All APCs on \the [station_name()] have been repaired.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg') + GLOB.event_announcement.Announce("All APCs on \the [station_name()] have been repaired.", "Power Systems Nominal", 'sound/AI/power_restore.ogg') for(var/thing in GLOB.apcs) var/obj/machinery/power/apc/A = thing var/area/current_area = get_area(A) @@ -101,7 +101,7 @@ log_and_message_admins("Power has been restored to all APCs.") if(power_type == 2) //Repair and Power APCs if(announce) - GLOB.event_announcement.Announce("All APCs on \the [station_name()] have been repaired and recharged. We apologize for the inconvenience.", "Power Systems Optimal", new_sound = 'sound/AI/poweron.ogg') + GLOB.event_announcement.Announce("All APCs on \the [station_name()] have been repaired and recharged. We apologize for the inconvenience.", "Power Systems Optimal", 'sound/AI/power_restore.ogg') // repair the APCs and recharge them for(var/thing in GLOB.apcs) var/obj/machinery/power/apc/A = thing @@ -115,7 +115,7 @@ /proc/power_restore_quick(announce = TRUE) if(announce) - GLOB.event_announcement.Announce("All SMESs on \the [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg') + GLOB.event_announcement.Announce("All SMESs on \the [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/AI/power_restore.ogg') // fix all of the SMESs for(var/obj/machinery/power/smes/S in GLOB.machines) if(!is_station_level(S.z)) diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 2ffcdb2acb9..e8a557ed069 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -14,7 +14,7 @@ "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.") /datum/event/brand_intelligence/announce() - GLOB.event_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert") + GLOB.event_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert", 'sound/AI/brand_intelligence.ogg') /datum/event/brand_intelligence/start() for(var/obj/machinery/vending/V in GLOB.machines) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 9a6ab6ca614..feba4fc1626 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -20,7 +20,7 @@ D.carrier = TRUE /datum/event/disease_outbreak/announce() - GLOB.event_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg') + GLOB.event_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak7.ogg') for(var/p in GLOB.dead_mob_list) var/mob/M = p to_chat(M, "[patient_zero] has been infected with [D.name] ([ghost_follow_link(patient_zero, M)])") diff --git a/code/modules/events/door_runtime.dm b/code/modules/events/door_runtime.dm index 39e02e694db..67110810a82 100644 --- a/code/modules/events/door_runtime.dm +++ b/code/modules/events/door_runtime.dm @@ -1,7 +1,7 @@ /datum/event/door_runtime /datum/event/door_runtime/announce() - GLOB.minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.", "Network Alert") + GLOB.minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.", "Network Alert", 'sound/AI/door_runtimes.ogg') /datum/event/door_runtime/start() for(var/obj/machinery/door/D in GLOB.airlocks) @@ -13,4 +13,4 @@ post_status("alert", "lockdown") /datum/event/door_runtime/proc/reboot() - GLOB.minor_announcement.Announce("Automatic system reboot complete. Have a secure day.","Network reset:") + GLOB.minor_announcement.Announce("Automatic system reboot complete. Have a secure day.","Network reset:", 'sound/AI/door_runtimes_fix.ogg') diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 17c697faf11..555d26ee353 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -3,7 +3,7 @@ var/lightsoutRange = 25 /datum/event/electrical_storm/announce() - GLOB.event_announcement.Announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") + GLOB.event_announcement.Announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert", 'sound/AI/elec_storm.ogg') /datum/event/electrical_storm/start() var/list/epicentreList = list() @@ -26,4 +26,3 @@ var/obj/effect/landmark/epicentre = thing for(var/obj/machinery/power/apc/apc in range(epicentre, lightsoutRange)) INVOKE_ASYNC(apc, /obj/machinery/power/apc.proc/overload_lighting) - diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 60fc5e4d39a..310bc8a1767 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -18,7 +18,7 @@ /datum/event/ion_storm/announce() if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance))) - GLOB.event_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/AI/ionstorm.ogg') + GLOB.event_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/AI/ions.ogg') /datum/event/ion_storm/start() //AI laws diff --git a/code/modules/events/koi_mirgration.dm b/code/modules/events/koi_mirgration.dm index 45f1ccf6d85..33510149c1b 100644 --- a/code/modules/events/koi_mirgration.dm +++ b/code/modules/events/koi_mirgration.dm @@ -5,4 +5,4 @@ /datum/event/carp_migration/koi/start() - spawn_fish(GLOB.landmarks_list.len) + spawn_fish(rand(4, 6)) //12 to 30 koi, in small groups diff --git a/code/modules/events/solarflare.dm b/code/modules/events/solarflare.dm index edd1726cbb2..fa72b6182cb 100644 --- a/code/modules/events/solarflare.dm +++ b/code/modules/events/solarflare.dm @@ -4,7 +4,7 @@ announceWhen = 1 /datum/event/solar_flare/announce() - GLOB.event_announcement.Announce("A solar flare has been detected on collision course with the station.", "Incoming Solar Flare", 'sound/AI/attention.ogg') + GLOB.event_announcement.Announce("A solar flare has been detected on collision course with the station.", "Incoming Solar Flare", 'sound/AI/flare.ogg') /datum/event/solar_flare/start() SSweather.run_weather(/datum/weather/solar_flare) diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 5f9a06a501b..6bcd369884e 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -11,7 +11,7 @@ /datum/event/spider_terror/announce() if(successSpawn) - GLOB.command_announcement.Announce("Confirmed outbreak of level 3 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/effects/siren-spooky.ogg') + GLOB.command_announcement.Announce("Confirmed outbreak of level 3 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/effects/siren-spooky.ogg', new_sound2 = 'sound/AI/outbreak3.ogg') else log_and_message_admins("Warning: Could not spawn any mobs for event Terror Spiders") @@ -61,4 +61,3 @@ successSpawn = TRUE #undef TS_HIGHPOP_TRIGGER - diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm index 85976290f9c..ae0597e501f 100644 --- a/code/modules/events/tear.dm +++ b/code/modules/events/tear.dm @@ -5,7 +5,7 @@ var/obj/effect/tear/TE /datum/event/tear/announce() - GLOB.event_announcement.Announce("A tear in the fabric of space and time has opened. Expected location: [impact_area.name].", "Anomaly Alert") + GLOB.event_announcement.Announce("A tear in the fabric of space and time has opened. Expected location: [impact_area.name].", "Anomaly Alert", 'sound/AI/anomaly.ogg') /datum/event/tear/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index daa2013a126..484b3eb2e73 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -6,7 +6,7 @@ var/list/vents = list() /datum/event/vent_clog/announce() - GLOB.event_announcement.Announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + GLOB.event_announcement.Announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", 'sound/AI/scrubbers.ogg') /datum/event/vent_clog/setup() endWhen = rand(25, 100) diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index f0e49305175..0649a5beed5 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -180,7 +180,7 @@ /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" desc = "Goes great with tomato soup!" - icon_state = "toastedsandwich" + icon_state = "grilledcheese" filling_color = "#D9BE29" list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value? tastes = list("toast" = 1, "grilled cheese" = 1) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4ec135e9e01..36da44bbfb1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -24,6 +24,21 @@ idle_power_usage = 2 active_power_usage = 500 +/obj/machinery/gibber/Initialize(mapload) + . = ..() + add_overlay("grjam") + component_parts = list() + component_parts += new /obj/item/circuitboard/gibber(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + RefreshParts() + +/obj/machinery/gibber/Destroy() + for(var/atom/movable/A in contents) + A.forceMove(get_turf(src)) + occupant = null + return ..() + /obj/machinery/gibber/suicide_act(mob/user) if(occupant || locked) return FALSE @@ -36,21 +51,6 @@ addtimer(CALLBACK(src, .proc/startgibbing, user), 33) return OBLITERATION -/obj/machinery/gibber/Destroy() - if(contents.len) - for(var/atom/movable/A in contents) - A.loc = get_turf(src) - if(occupant) - occupant = null - return ..() - -/obj/machinery/gibber/RefreshParts() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts. - return - -/obj/machinery/gibber/New() - ..() - overlays += image('icons/obj/kitchen.dmi', "grjam") - /obj/machinery/gibber/update_icon() overlays.Cut() @@ -139,8 +139,8 @@ to_chat(user, "This is not suitable for [src]!") return - if(victim.abiotic(1)) - to_chat(user, "Subject may not have abiotic items on.") + if(victim.abiotic(TRUE)) + to_chat(user, "Subject may not have anything on their body.") return user.visible_message("[user] starts to put [victim] into [src]!") diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index b42045f86d9..13cce41ed77 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -277,6 +277,13 @@ if(can_insert && istype(disk.gene, /datum/plant_gene/trait)) dat += "Insert: [disk.gene.get_name()]" dat += "" + + dat += "

Variant

" + dat += "" + dat += "" + if(seed.variant) + dat += "" + dat += "
[seed.variant ? seed.variant : "None"]EditRemove
" else dat += "
No sample found.
Please, insert a plant sample to use this device." popup.set_content(dat) @@ -391,6 +398,16 @@ else if(href_list["abort"]) operation = "" target = null + else if(href_list["set_v"]) + if(!seed) + return + seed.variant_prompt(usr, src) + else if(href_list["del_v"]) + if(!seed) + return + seed.variant = null + seed.apply_variant_name() + to_chat(usr, "You remove the [seed.plantname]'s variant designation.") interact(usr) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index a69e2da495e..e5d4f501c5d 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -42,6 +42,8 @@ seed.prepare_result(src) transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 //Makes the resulting produce's sprite larger or smaller based on potency! add_juice() + if(seed.variant) + name += " \[[seed.variant]]" /obj/item/reagent_containers/food/snacks/grown/Destroy() QDEL_NULL(seed) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 134e337fa4e..81a4f83e6a6 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -344,7 +344,10 @@ /obj/machinery/hydroponics/examine(user) . = ..() if(myseed) - . += "It has [myseed.plantname] planted." + if(myseed.variant) + . += "It has the [myseed.variant] variant of [myseed.plantname] planted." + else + . += "It has [myseed.plantname] planted." if (dead) . += "It's dead!" else if (harvest) @@ -875,7 +878,8 @@ plant_hud_set_status() adjustWeeds(-10) //Has a side effect of cleaning up those nasty weeds update_icon() - + else if(istype(O, /obj/item/pen) && myseed) + myseed.variant_prompt(user, src) else return ..() diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 34ec63ebcb7..f35d7751c7a 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -109,6 +109,7 @@ /datum/seed_pile var/name = "" + var/variant = "" var/lifespan = 0 //Saved stats var/endurance = 0 var/maturation = 0 @@ -117,8 +118,9 @@ var/potency = 0 var/amount = 0 -/datum/seed_pile/New(name, life, endur, matur, prod, yie, poten, am = 1) +/datum/seed_pile/New(name, variant, life, endur, matur, prod, yie, poten, am = 1) src.name = name + src.variant = variant src.lifespan = life src.endurance = endur src.maturation = matur @@ -145,9 +147,9 @@ if (contents.len == 0) dat += "No seeds" else - dat += "" + dat += "
NameLifespanEnduranceMaturationProductionYieldPotencyStock
" for (var/datum/seed_pile/O in piles) - dat += "" + dat += "" dat += "" dat += "
NameVariantLifespanEnduranceMaturationProductionYieldPotencyStock
[O.name][O.lifespan][O.endurance][O.maturation]
[O.name][O.variant][O.lifespan][O.endurance][O.maturation][O.production][O.yield][O.potency]" dat += "Vend ([O.amount] left)
" @@ -203,9 +205,9 @@ O.forceMove(src) . = 1 for (var/datum/seed_pile/N in piles) - if (O.plantname == N.name && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency) + if (O.plantname == N.name && O.variant == N.variant && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency) ++N.amount return - piles += new /datum/seed_pile(O.plantname, O.lifespan, O.endurance, O.maturation, O.production, O.yield, O.potency) + piles += new /datum/seed_pile(O.plantname, O.variant, O.lifespan, O.endurance, O.maturation, O.production, O.yield, O.potency) return diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index cd9271379ed..539ab5e7573 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -10,6 +10,7 @@ var/plantname = "Plants" // Name of plant when planted. var/product // A type path. The thing that is created when the plant is harvested. var/species = "" // Used to update icons. Should match the name in the sprites unless all icon_* are overriden. + var/variant = null // Optional custom name to track modified plants. Can be set with pen or from gene modder. var/growing_icon = 'icons/obj/hydroponics/growing.dmi' //the file that stores the sprites of the growing plant from this seed. var/icon_grow // Used to override grow icon (default is "[species]-grow"). You can use one grow icon for multiple closely related plants with it. @@ -83,6 +84,8 @@ S.potency = potency S.weed_rate = weed_rate S.weed_chance = weed_chance + S.variant = variant + S.apply_variant_name() S.genes = list() for(var/g in genes) var/datum/plant_gene/G = g @@ -317,16 +320,43 @@ return /obj/item/seeds/attackby(obj/item/O, mob/user, params) - if (istype(O, /obj/item/plant_analyzer)) + if(istype(O, /obj/item/plant_analyzer)) to_chat(user, "*---------*\n This is \a [src].") var/text = get_analyzer_text() if(text) to_chat(user, "[text]") return + if(istype(O, /obj/item/pen)) + variant_prompt(user) + return ..() // Fallthrough to item/attackby() so that bags can pick seeds up +/obj/item/seeds/proc/variant_prompt(mob/user, obj/item/container = null) + var/prev = variant + var/V = input(user, "Choose variant name:", "Plant Variant Naming", variant) as text|null + if(isnull(V)) // Did the user cancel? + return + if(container && (loc != container)) // Was the seed removed from the container, if there is a container? + return + if(!(container ? container : src).Adjacent(user)) // Is the user next to the seed/container? + return + variant = copytext(sanitize(html_encode(trim(V))), 1, 64) // Sanitization must happen after null check because it converts nulls to empty strings + if(variant == "") + variant = null + if(prev != variant) + to_chat(user, "You [variant ? "change" : "remove"] the [plantname]'s variant designation.") + apply_variant_name() + +/obj/item/seeds/proc/apply_variant_name() + var/V = variant ? " \[[variant]]" : "" // If we have a non-empty variant add it to the name + var/N = initial(name) + if(copytext(name, 1, 13) == "experimental") // Don't delete 'experimental' + N = "experimental " + N + name = N + V + if(GetComponent(/datum/component/label)) + GetComponent(/datum/component/label).apply_label() // Don't delete labels diff --git a/code/modules/maze_generation/maze_generator.dm b/code/modules/maze_generation/maze_generator.dm index 96f6392a3f1..339b595f084 100644 --- a/code/modules/maze_generation/maze_generator.dm +++ b/code/modules/maze_generation/maze_generator.dm @@ -14,7 +14,7 @@ do { \ var/timer = start_watch(); \ proc2run ;\ - log_debug("\[MAZE] Operation '[opname]' on maze at [##x],[##y],[##z] took [stop_watch(timer)]s"); \ + log_debug("\[MAZE] Operation '[opname]' on maze at [x],[y],[z] took [stop_watch(timer)]s"); \ } while (FALSE) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 56c5c820559..f289a2dc8e1 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -104,21 +104,7 @@ new /obj/item/toy/katana(src) if(85 to 86) new /obj/item/defibrillator/compact(src) - if(87) //1% chance - new /obj/item/weed_extract(src) - if(88) - new /obj/item/organ/internal/brain(src) - if(89) - new /obj/item/organ/internal/brain/xeno(src) - if(90) - new /obj/item/organ/internal/heart(src) - if(91) - new /obj/item/soulstone/anybody(src) - if(92) - new /obj/item/katana(src) - if(93) - new /obj/item/dnainjector/xraymut(src) - if(94) + if(87 to 88) new /obj/item/storage/backpack/clown(src) new /obj/item/clothing/under/rank/clown(src) new /obj/item/clothing/shoes/clown_shoes(src) @@ -128,6 +114,18 @@ new /obj/item/toy/crayon/rainbow(src) new /obj/item/reagent_containers/spray/waterflower(src) new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src) + if(89) //1% chance + new /obj/item/weed_extract(src) + if(90) + new /obj/item/organ/internal/brain(src) + if(91) + new /obj/item/organ/internal/brain/xeno(src) + if(92) + new /obj/item/organ/internal/heart(src) + if(93) + new /obj/item/soulstone/anybody(src) + if(94) + new /obj/item/katana(src) if(95) new /obj/item/clothing/under/mime(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 9e9245d274a..a7dc2c86a9f 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -19,7 +19,7 @@ log_ghostemote(message, src) if(src.client) - if(src.client.prefs.muted & MUTE_DEADCHAT) + if(check_mute(client.ckey, MUTE_DEADCHAT)) to_chat(src, "You cannot emote in deadchat (muted).") return diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 12312a4fdff..ae6cd715cec 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -112,7 +112,7 @@ O.show_message(message, m_type) /mob/proc/emote_dead(message) - if(client.prefs.muted & MUTE_DEADCHAT) + if(check_mute(client.ckey, MUTE_DEADCHAT)) to_chat(src, "You cannot send deadchat emotes (muted).") return diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 9871c735725..e2c2a224831 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -14,10 +14,10 @@ if(silent) return if(src.client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot send IC messages (muted).") return - if(src.client.handle_spam_prevention(message,MUTE_IC)) + if(src.client.handle_spam_prevention(message, MUTE_IC)) return if(stat) return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 160a9d55288..46a71531dcd 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1203,6 +1203,14 @@ so that different stomachs can handle things in different ways VB*/ sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS) see_in_dark = max(see_in_dark, 8) + if(HAS_TRAIT(src, TRAIT_MESON_VISION)) + sight |= SEE_TURFS + lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) + + if(HAS_TRAIT(src, TRAIT_NIGHT_VISION)) + see_in_dark = max(see_in_dark, 8) + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT) sync_lighting_plane_alpha() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index a8a4133310d..d98e00b1e3f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -446,15 +446,14 @@ SpinAnimation(5,1) if("spin", "spins") - if(!restrained() && !lying) + if(!incapacitated(ignore_lying = TRUE)) if(prob(5)) - spin(30, 1) - message = "[src] spins too much!" + spin(32, 1) + to_chat(src, "You spin too much!") Dizzy(12) Confused(12) else spin(20, 1) - message = "[src] spins!" if("aflap", "aflaps") if(!restrained()) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 139a3868f1d..0f8d3e2bb63 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -39,7 +39,7 @@ emp_act if(mind?.martial_art?.deflection_chance) //Some martial arts users can deflect projectiles! if(!lying && !HAS_TRAIT(src, TRAIT_HULK) && mind.martial_art.try_deflect(src)) //But only if they're not lying down, and hulks can't do it add_attack_logs(P.firer, src, "hit by [P.type] but got deflected by martial arts '[mind.martial_art]'") - visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!") + visible_message("[src] deflects the projectile!", "You deflect the projectile!") playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) if(mind.martial_art.reroute_deflection) P.firer = src diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 7d1ae80a955..f7cc37fbd8b 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -894,13 +894,21 @@ It'll return null if the organ doesn't correspond, so include null checks when u if(!isnull(H.vision_type.lighting_alpha)) H.lighting_alpha = min(H.vision_type.lighting_alpha, H.lighting_alpha) - if(HAS_TRAIT(src, TRAIT_THERMAL_VISION)) + if(HAS_TRAIT(H, TRAIT_MESON_VISION)) + H.sight |= SEE_TURFS + H.lighting_alpha = min(H.lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) + + if(HAS_TRAIT(H, TRAIT_THERMAL_VISION)) H.sight |= (SEE_MOBS) H.lighting_alpha = min(H.lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE) if(HAS_TRAIT(H, TRAIT_XRAY_VISION)) H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS) + if(HAS_TRAIT(H, TRAIT_NIGHT_VISION)) + H.see_in_dark = max(H.see_in_dark, 8) + H.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + if(H.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) H.see_invisible = SEE_INVISIBLE_OBSERVER diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 963b878a758..43c0931f96b 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -21,7 +21,7 @@ death_message = "gives a short series of shrill beeps, their chassis shuddering before falling limp, nonfunctional." death_sounds = list('sound/voice/borg_deathsound.ogg') //I've made this a list in the event we add more sounds for dead robots. - species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_CLONESCAN, NO_INTORGANS, NOTRANSSTING) + species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_CLONESCAN, NO_INTORGANS) inherent_traits = list(TRAIT_VIRUSIMMUNE, TRAIT_NOBREATH, TRAIT_RADIMMUNE, TRAIT_NOGERMS, TRAIT_NODECAY, TRAIT_NOPAIN, TRAIT_GENELESS) //Computers that don't decay? What a lie! inherent_biotypes = MOB_ROBOTIC | MOB_HUMANOID clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 926ed17348e..4a49b965fb8 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -5,7 +5,7 @@ dangerous_existence = TRUE //So so much //language = "Clatter" - species_traits = list(IS_WHITELISTED, NO_BLOOD, NOTRANSSTING, NO_HAIR) + species_traits = list(IS_WHITELISTED, NO_BLOOD, NO_HAIR) inherent_traits = list(TRAIT_RADIMMUNE, TRAIT_NOHUNGER) inherent_biotypes = MOB_HUMANOID | MOB_MINERAL forced_heartattack = TRUE // Plasmamen have no blood, but they should still get heart-attacks diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index e7736da2291..377da561e5a 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -22,7 +22,7 @@ eyes = "vox_eyes_s" - species_traits = list(NO_CLONESCAN, IS_WHITELISTED, NOTRANSSTING) + species_traits = list(NO_CLONESCAN, IS_WHITELISTED) inherent_traits = list(TRAIT_NOGERMS, TRAIT_NODECAY) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS //Species-fitted 'em all. dietflags = DIET_OMNI diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index bd0aad32dac..148e73e873f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -760,7 +760,7 @@ //called when the mob receives a bright flash /mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) - if(check_eye_prot() < intensity && (override_blindness_check || !HAS_TRAIT(src, TRAIT_BLIND))) + if(check_eye_prot() < intensity && (override_blindness_check || !HAS_TRAIT(src, TRAIT_BLIND)) && !HAS_TRAIT(src, TRAIT_FLASH_PROTECTION)) overlay_fullscreen("flash", type) addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25) return 1 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 43d1c402fd0..0ac3b497530 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) /mob/living/say(message, verb = "says", sanitize = TRUE, ignore_speech_problems = FALSE, ignore_atmospherics = FALSE, ignore_languages = FALSE) if(client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot speak in IC (Muted).") return @@ -297,7 +297,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) /mob/living/emote(act, type, message, force) //emote code is terrible, this is so that anything that isn't already snowflaked to shit can call the parent and handle emoting sanely if(client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot speak in IC (Muted).") return @@ -352,7 +352,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) /mob/living/proc/whisper_say(list/message_pieces, verb = "whispers") if(client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot speak in IC (Muted).") return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 6c646d2509e..5d20cb66209 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -212,6 +212,20 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( GLOB.shuttle_caller_list += src ..() +/mob/living/silicon/ai/Destroy() + GLOB.ai_list -= src + GLOB.shuttle_caller_list -= src + SSshuttle.autoEvac() + if(malfhacking) + deltimer(malfhacking) + malfhacking = null + QDEL_NULL(eyeobj) // No AI, no Eye + QDEL_NULL(aiPDA) + QDEL_NULL(aiMulti) + QDEL_NULL(aiRadio) + QDEL_NULL(builtInCamera) + return ..() + /mob/living/silicon/ai/proc/on_mob_init() to_chat(src, "You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).") to_chat(src, "To look at other parts of the station, click on yourself to get a camera menu.") @@ -314,17 +328,6 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( return TRUE -/mob/living/silicon/ai/Destroy() - GLOB.ai_list -= src - GLOB.shuttle_caller_list -= src - SSshuttle.autoEvac() - QDEL_NULL(eyeobj) // No AI, no Eye - if(malfhacking) - deltimer(malfhacking) - malfhacking = null - malfhack = null - return ..() - /* The AI Power supply is a dummy object used for powering the AI since only machinery should be using power. diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 717f9700316..30bd84c48fc 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -27,7 +27,7 @@ if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time - GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg') + GLOB.priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/eshuttle_dock.ogg') qdel(doomsday_device) if(explosive) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 21d9e75db90..5748775558a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1147,55 +1147,18 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( cell = null qdel(src) -#define BORG_CAMERA_BUFFER 30 -/mob/living/silicon/robot/Move(a, b, flag) - var/oldLoc = src.loc +#define BORG_CAMERA_BUFFER 3 SECONDS + +/mob/living/silicon/robot/Move(atom/newloc, direct, movetime) + var/oldLoc = loc . = ..() - if(.) - if(src.camera) - if(!updating) - updating = 1 - spawn(BORG_CAMERA_BUFFER) - if(camera && oldLoc != src.loc) - GLOB.cameranet.updatePortableCamera(src.camera) - updating = 0 - if(module) - if(module.type == /obj/item/robot_module/janitor) - var/turf/tile = loc - if(stat != DEAD && isturf(tile)) - var/floor_only = TRUE - for(var/A in tile) - if(istype(A, /obj/effect)) - var/obj/effect/E = A - if(E.is_cleanable()) - var/obj/effect/decal/cleanable/blood/B = E - if(istype(B) && B.off_floor) - floor_only = FALSE - else - qdel(E) - else if(istype(A, /obj/item)) - var/obj/item/cleaned_item = A - cleaned_item.clean_blood() - else if(istype(A, /mob/living/carbon/human)) - var/mob/living/carbon/human/cleaned_human = A - if(cleaned_human.lying) - if(cleaned_human.head) - cleaned_human.head.clean_blood() - cleaned_human.update_inv_head() - if(cleaned_human.wear_suit) - cleaned_human.wear_suit.clean_blood() - cleaned_human.update_inv_wear_suit() - else if(cleaned_human.w_uniform) - cleaned_human.w_uniform.clean_blood() - cleaned_human.update_inv_w_uniform() - if(cleaned_human.shoes) - cleaned_human.shoes.clean_blood() - cleaned_human.update_inv_shoes() - cleaned_human.clean_blood() - to_chat(cleaned_human, "[src] cleans your face!") - if(floor_only) - tile.clean_blood() - return + if(. && !updating && camera) + updating = TRUE + spawn(BORG_CAMERA_BUFFER) + if(camera && oldLoc != loc) + GLOB.cameranet.updatePortableCamera(camera) + updating = FALSE + #undef BORG_CAMERA_BUFFER /mob/living/silicon/robot/proc/self_destruct() diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 8554068dce8..8a43a2a011e 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -447,6 +447,43 @@ /obj/item/extinguisher/mini ) +/obj/item/robot_module/janitor/Initialize(mapload) + . = ..() + var/mob/living/silicon/robot/R = loc + RegisterSignal(R, COMSIG_MOVABLE_MOVED, .proc/on_cyborg_move) + +/** + * Proc called after the janitor cyborg has moved, in order to clean atoms at it's new location. + * + * Arguments: + * * mob/living/silicon/robot/R - The cyborg who moved. + */ +/obj/item/robot_module/janitor/proc/on_cyborg_move(mob/living/silicon/robot/R) + SIGNAL_HANDLER + + if(R.stat == DEAD || !isturf(R.loc)) + return + var/turf/tile = R.loc + for(var/A in tile) + if(iseffect(A)) + var/obj/effect/E = A + if(!E.is_cleanable()) + continue + var/obj/effect/decal/cleanable/blood/B = E + if(istype(B) && B.off_floor) + tile.clean_blood() + else + qdel(E) + else if(isitem(A)) + var/obj/item/I = A + I.clean_blood() + else if(ishuman(A)) + var/mob/living/carbon/human/cleaned_human = A + if(!cleaned_human.lying) + continue + cleaned_human.clean_blood() + to_chat(cleaned_human, "[src] cleans your face!") + /obj/item/reagent_containers/spray/cyborg_lube name = "Lube spray" list_reagents = list("lube" = 250) diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index 1cc904f1017..9e5ae1e2ec1 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -33,27 +33,16 @@ // break_stuff_probability = 2 faction = list("scarybat") - var/mob/living/owner gold_core_spawnable = HOSTILE_SPAWN -/mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob) - ..() +/mob/living/simple_animal/hostile/scarybat/Initialize(mapload, mob/living/L) + . = ..() if(istype(L)) - owner = L + faction += "\ref[L]" /mob/living/simple_animal/hostile/scarybat/Process_Spacemove(check_drift = 0) return ..() //No drifting in space for space carp! //original comments do not steal -/mob/living/simple_animal/hostile/scarybat/Found(atom/A)//This is here as a potential override to pick a specific target if available - if(istype(A) && A == owner) - return 0 - return ..() - -/mob/living/simple_animal/hostile/scarybat/CanAttack(atom/the_target)//This is here as a potential override to pick a specific target if available - if(istype(the_target) && the_target == owner) - return 0 - return ..() - /mob/living/simple_animal/hostile/scarybat/AttackingTarget() . =..() var/mob/living/L = . diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 0370a84baba..63a883b4d00 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -31,7 +31,6 @@ move_to_delay = 0 obj_damage = 0 environment_smash = 0 - mouse_opacity = MOUSE_OPACITY_OPAQUE pass_flags = PASSTABLE | PASSGRILLE | PASSMOB density = FALSE mob_size = MOB_SIZE_TINY @@ -51,6 +50,8 @@ var/isqueen = FALSE var/bee_syndicate = FALSE var/icon_base = "bee" + var/last_attack = 0 + var/opacity_time = 1 MINUTES var/static/list/bee_icons = list() var/static/beehometypecache = typecacheof(/obj/structure/beebox) var/static/hydroponicstypecache = typecacheof(/obj/machinery/hydroponics) @@ -162,6 +163,7 @@ else . = ..() if(. && isliving(target) && (!client || a_intent == INTENT_HARM)) + make_opaque() var/mob/living/L = target if(L.reagents) if(beegent) @@ -170,6 +172,23 @@ else L.reagents.add_reagent("spidertoxin", 5) +/mob/living/simple_animal/hostile/poison/bees/proc/make_opaque() + // If a bee attacks someone, make it very easy to hit for a while + last_attack = world.time + mouse_opacity = MOUSE_OPACITY_OPAQUE + +/mob/living/simple_animal/hostile/poison/bees/Life(seconds, times_fired) + . = ..() + if(mind || (mouse_opacity == initial(mouse_opacity))) + return + var/diff = world.time - last_attack + if(diff >= opacity_time) + mouse_opacity = initial(mouse_opacity) + +/mob/living/simple_animal/hostile/poison/bees/sentience_act() + . = ..() + make_opaque() + /mob/living/simple_animal/hostile/poison/bees/proc/assign_reagent(datum/reagent/R) if(istype(R)) beegent = R @@ -233,6 +252,7 @@ desc = "She's the queen of bees, BZZ BZZ" icon_base = "queen" isqueen = TRUE + mouse_opacity = MOUSE_OPACITY_OPAQUE //the Queen doesn't leave the box on her own, and she CERTAINLY doesn't pollinate by herself @@ -324,6 +344,7 @@ search_objects = FALSE //these bees don't care about trivial things like plants, especially when there is havoc to sow bee_syndicate = TRUE var/list/master_and_friends = list() + mouse_opacity = MOUSE_OPACITY_OPAQUE /mob/living/simple_animal/hostile/poison/bees/syndi/New() beegent = GLOB.chemical_reagents_list["facid"] //Prepare to die diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 4c3635e406a..9d2ddae7a65 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -33,7 +33,7 @@ /mob/living/simple_animal/hostile/netherworld/migo/Initialize(mapload) . = ..() - migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/voice/bcreep.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/mpatchedup.ogg', 'sound/voice/mfeelbetter.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heartbeat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/goonstation/effects/screech.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/goonstation/misc/airraid_loop.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/chainsaw.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gunshots/gunshot_silenced.ogg', 'sound/weapons/gunshots/gunshot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlock_close.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlock_open.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/outbreak5.ogg', 'sound/ai/outbreak7.ogg', 'sound/ai/poweroff.ogg', 'sound/ai/radiation.ogg', 'sound/ai/shuttlecalled.ogg', 'sound/ai/shuttledock.ogg', 'sound/ai/shuttlerecalled.ogg', 'sound/ai/aimalf.ogg', 'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen3.ogg', 'sound/ambience/ambigen4.ogg', 'sound/ambience/ambigen5.ogg', 'sound/ambience/ambigen6.ogg', 'sound/ambience/ambigen10.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg') //hahahaha fuck you code divers + migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/voice/bcreep.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/mpatchedup.ogg', 'sound/voice/mfeelbetter.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heartbeat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/goonstation/effects/screech.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/goonstation/misc/airraid_loop.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/chainsaw.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gunshots/gunshot_silenced.ogg', 'sound/weapons/gunshots/gunshot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlock_close.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlock_open.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/outbreak5.ogg', 'sound/ai/outbreak7.ogg', 'sound/ai/alert.ogg', 'sound/ai/radiation.ogg', 'sound/ai/eshuttle_call.ogg', 'sound/ai/eshuttle_dock.ogg', 'sound/ai/eshuttle_recall.ogg', 'sound/ai/aimalf.ogg', 'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen3.ogg', 'sound/ambience/ambigen4.ogg', 'sound/ambience/ambigen5.ogg', 'sound/ambience/ambigen6.ogg', 'sound/ambience/ambigen10.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg') //hahahaha fuck you code divers /mob/living/simple_animal/hostile/netherworld/migo/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) ..() diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 0eceec7a124..14ce0de54c8 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -19,10 +19,10 @@ if(silent) return if(src.client) - if(client.prefs.muted & MUTE_IC) + if(check_mute(client.ckey, MUTE_IC)) to_chat(src, "You cannot send IC messages (muted).") return - if(src.client.handle_spam_prevention(message,MUTE_IC)) + if(src.client.handle_spam_prevention(message, MUTE_IC)) return if(stat) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f801c0f072f..c6cceea3842 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1351,17 +1351,21 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ return FALSE //overridden in living.dm /mob/proc/spin(spintime, speed) - set waitfor = 0 + set waitfor = FALSE if(!spintime || !speed || spintime > 100) CRASH("Aborted attempted call of /mob/proc/spin with invalid args ([spintime],[speed]) which could have frozen the server.") - var/end_time = world.time + spintime - var/spin_dir = prob(50) - while(world.time <= end_time) + while(spintime >= speed) sleep(speed) - if(spin_dir) - dir = turn(dir, 90) - else - dir = turn(dir, -90) + switch(dir) + if(NORTH) + setDir(EAST) + if(SOUTH) + setDir(WEST) + if(EAST) + setDir(SOUTH) + if(WEST) + setDir(NORTH) + spintime -= speed /mob/proc/is_literate() return FALSE @@ -1479,7 +1483,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ MA.plane = GAME_PLANE pic.appearance = MA flick_overlay(pic, list(client), 10) - + GLOBAL_LIST_INIT(holy_areas, typecacheof(list( /area/chapel diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index e199e81eb69..10d56a99dc0 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -51,7 +51,7 @@ to_chat(src, "Deadchat is globally muted.") return - if(client.prefs.muted & MUTE_DEADCHAT) + if(check_mute(client.ckey, MUTE_DEADCHAT)) to_chat(src, "You cannot talk in deadchat (muted).") return diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 76a5dd4dc03..a3a4d0c58c4 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -40,11 +40,15 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /// Target department to send outgoing faxes to var/destination -/obj/machinery/photocopier/faxmachine/New() - ..() +/obj/machinery/photocopier/faxmachine/Initialize(mapload) + . = ..() GLOB.allfaxes += src update_network() +/obj/machinery/photocopier/faxmachine/Destroy() + GLOB.allfaxes -= src + return ..() + /obj/machinery/photocopier/faxmachine/proc/update_network() if(department != "Unknown") if(!(("[department]" in GLOB.alldepartments) || ("[department]" in GLOB.hidden_departments) || ("[department]" in GLOB.admin_departments) || ("[department]" in GLOB.hidden_admin_departments))) diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm index 5db744c37ef..fe4ef7962f3 100644 --- a/code/modules/pda/mob_hunt_game_app.dm +++ b/code/modules/pda/mob_hunt_game_app.dm @@ -28,6 +28,11 @@ disconnect("Program Terminated") STOP_PROCESSING(SSobj, pda) +/datum/data/pda/app/mob_hunter_game/Destroy() + STOP_PROCESSING(SSobj, pda) + SSmob_hunt.connected_clients -= src + return ..() + /datum/data/pda/app/mob_hunter_game/proc/scan_nearby() if(!SSmob_hunt || !connected) return @@ -74,13 +79,14 @@ return scan_nearby() -/datum/data/pda/app/mob_hunter_game/proc/register_capture(datum/mob_hunt/captured, wild = 0) +/datum/data/pda/app/mob_hunter_game/proc/register_capture(datum/mob_hunt/captured, wild = FALSE) if(!captured) - return 0 - my_collection.Add(captured) + return FALSE + my_collection += captured + RegisterSignal(captured, COMSIG_PARENT_QDELETING, .proc/remove_mob) if(wild) wild_captures++ - return 1 + return TRUE /datum/data/pda/app/mob_hunter_game/update_ui(mob/user, list/data) if(!SSmob_hunt || !(src in SSmob_hunt.connected_clients)) @@ -138,12 +144,27 @@ card.forceMove(get_turf(pda)) remove_mob() -/datum/data/pda/app/mob_hunter_game/proc/remove_mob() - if(!my_collection.len) +/** + * Removes a Nanomob from the [my_collection] list. + * + * The Nanomob that is currently selected in the app ([current_index]) will be removed from the list unless a `mob_override` argument is given, in which case that will be removed instead. + * + * Arguments: + * * mob_override - A specific Nanomob to remove from the list. (Optional) + */ +/datum/data/pda/app/mob_hunter_game/proc/remove_mob(datum/mob_hunt/mob_override = null) + SIGNAL_HANDLER + if(!length(my_collection)) return - my_collection.Remove(my_collection[current_index]) - if(current_index > my_collection.len) - current_index = my_collection.len + + if(mob_override) + my_collection -= mob_override + else + my_collection -= my_collection[current_index] + + var/collection_length = length(my_collection) + if(current_index > collection_length) + current_index = collection_length /datum/data/pda/app/mob_hunter_game/proc/set_trap() if(!my_collection.len || !pda || !hacked) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 49044665c08..ffb92c12cc4 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1355,7 +1355,7 @@ for(var/obj/machinery/light/L in area) if(L.nightshift_allowed) L.nightshift_enabled = nightshift_lights - L.update(FALSE) + L.update(FALSE, play_sound = FALSE) CHECK_TICK /obj/machinery/power/apc/proc/relock_callback() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index fcccefbf513..db7152b3505 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -35,6 +35,7 @@ By design, d1 is the smallest direction and d2 is the highest icon_state = "0-1" var/d1 = 0 var/d2 = 1 + plane = FLOOR_PLANE layer = WIRE_LAYER //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4 color = COLOR_RED @@ -68,9 +69,11 @@ By design, d1 is the smallest direction and d2 is the highest d2 = text2num(copytext( icon_state, dash+1 )) var/turf/T = get_turf(src) // hide if turf is not intact + LAZYADD(GLOB.cable_list, src) //add it to the global cable list + if(T.transparent_floor) + return if(level == 1) hide(T.intact) - LAZYADD(GLOB.cable_list, src) //add it to the global cable list /obj/structure/cable/Destroy() // called when a cable is deleted if(powernet) @@ -162,7 +165,8 @@ By design, d1 is the smallest direction and d2 is the highest // /obj/structure/cable/attackby(obj/item/W, mob/user) var/turf/T = get_turf(src) - if(T.intact) + if(T.transparent_floor || T.intact) + to_chat(user, "You can't interact with something that's under the floor!") return else if(istype(W, /obj/item/stack/cable_coil)) @@ -204,7 +208,8 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/cable/wirecutter_act(mob/user, obj/item/I) . = TRUE var/turf/T = get_turf(src) - if(T.intact) + if(T.transparent_floor || T.intact) + to_chat(user, "You can't interact with something that's under the floor!") return if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return @@ -703,7 +708,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain var/turf/T = get_turf(C) - if(!isturf(T) || T.intact) // sanity checks, also stop use interacting with T-scanner revealed cable + if(!isturf(T) || T.intact || T.transparent_floor) // sanity checks, also stop use interacting with T-scanner revealed cable return if(get_dist(C, user) > 1) // make sure it's close enough @@ -719,7 +724,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain // one end of the clicked cable is pointing towards us if(C.d1 == dirn || C.d2 == dirn) - if(U.intact) // can't place a cable if the floor is complete + if(U.intact || U.transparent_floor) // can't place a cable if the floor is complete to_chat(user, "You can't lay cable there unless the floor tiles are removed!") return else diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 38575891d07..eae1047d0e0 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -284,6 +284,12 @@ charge = 0 update_icon() +/obj/item/stock_parts/cell/bluespace/charging + name = "self-charging bluespace power cell" + desc = "An experimental, self-charging, transdimensional power cell." + origin_tech = "powerstorage=10;bluespace=10" + self_recharge = TRUE + /obj/item/stock_parts/cell/infinite name = "infinite-capacity power cell!" icon_state = "icell" @@ -294,7 +300,7 @@ chargerate = 30000 /obj/item/stock_parts/cell/infinite/use() - return 1 + return TRUE /obj/item/stock_parts/cell/infinite/abductor name = "void core" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e275b747814..cb605bf2beb 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -8,6 +8,9 @@ #define LIGHT_BROKEN 2 #define LIGHT_BURNED 3 +#define LIGHT_ON_DELAY_LOWER 1 SECONDS +#define LIGHT_ON_DELAY_UPPER 3 SECONDS + /** * # Light fixture frame * @@ -173,6 +176,8 @@ power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list /// Is the light on or off? var/on = FALSE + /// Is the light currently turning on? + var/turning_on = FALSE /// If the light state has changed since the last 'update()', also update the power requirements var/power_state = FALSE /// How much power does it use? @@ -260,7 +265,7 @@ brightness_color = "#a0a080" if(prob(5)) break_light_tube(TRUE) - update(FALSE) + update(FALSE, TRUE, FALSE) /obj/machinery/light/Destroy() var/area/A = get_area(src) @@ -290,62 +295,87 @@ return /** - * Updates the light's properties + * Updates the light's 'on' state and power consumption based on [/obj/machinery/light/var/on]. * - * Updates the icon_state, luminosity, colour, and power usage of the light. - * Also handles rigged light bulbs exploding. * Arguments: - * * trigger - Should this update make the light explode/burn out? (Defaults to TRUE) + * * trigger - Should this update check if the light will explode/burn out. + * * instant - Will the lightbulb turn on instantly, or after a short delay. + * * play_sound - Will the lightbulb play a sound when it's turned on. */ -/obj/machinery/light/proc/update(trigger = TRUE) +/obj/machinery/light/proc/update(trigger = TRUE, instant = FALSE, play_sound = TRUE) switch(status) if(LIGHT_BROKEN, LIGHT_BURNED, LIGHT_EMPTY) on = FALSE - update_icon() - if(on) - var/BR = brightness_range - var/PO = brightness_power - var/CO = brightness_color - if(color) - CO = color - var/area/A = get_area(src) - if(A && A.fire) - CO = bulb_emergency_colour - else if(nightshift_enabled) - BR = nightshift_light_range - PO = nightshift_light_power - if(!color) - CO = nightshift_light_color - var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color - if(!matching) - switchcount++ - if(rigged) - if(status == LIGHT_OK && trigger) - log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast]") - message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast]") - explode() - // Whichever number is smallest gets set as the prob - // Each spook adds a 0.5% to 1% chance of burnout - else if(prob(min(40, switchcount / 10))) - if(status == LIGHT_OK && trigger) - burnout() - - else - use_power = ACTIVE_POWER_USE - set_light(BR, PO, CO) - else + if(on) // Turning on + if(instant) + _turn_on(trigger, play_sound) + else if(!turning_on) + turning_on = TRUE + addtimer(CALLBACK(src, .proc/_turn_on, trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER)) + else // Turning off use_power = IDLE_POWER_USE set_light(0) + update_icon() active_power_usage = (brightness_range * 10) if(on != power_state) // Light was turned on/off, so update the power usage power_state = on if(on) - static_power_used = brightness_range * 20 //20W per unit luminosity + static_power_used = brightness_range * 20 //20W per unit of luminosity addStaticPower(static_power_used, STATIC_LIGHT) else removeStaticPower(static_power_used, STATIC_LIGHT) +/** + * The actual proc to turn on the lightbulb. + * + * Private proc, do not call directly. Use [/obj/machinery/light/proc/update] instead. + * + * Sets the light power, range, and colour based on environmental conditions such as night shift and fire alarms. + * Also handles light bulbs burning out and exploding if `trigger` is `TRUE`. + */ +/obj/machinery/light/proc/_turn_on(trigger, play_sound = TRUE) + PRIVATE_PROC(TRUE) + if(QDELETED(src)) + return + turning_on = FALSE + if(!on) + return + var/BR = brightness_range + var/PO = brightness_power + var/CO = brightness_color + if(color) + CO = color + var/area/A = get_area(src) + if(A?.fire) + CO = bulb_emergency_colour + else if(nightshift_enabled) + BR = nightshift_light_range + PO = nightshift_light_power + if(!color) + CO = nightshift_light_color + if(light && (BR == light.light_range) && (PO == light.light_power) && (CO == light.light_color)) + return // Nothing's changed here + + switchcount++ + update_icon() + if(trigger && (status == LIGHT_OK)) + if(rigged) + log_admin("LOG: Rigged light explosion, last touched by [fingerprintslast].") + message_admins("LOG: Rigged light explosion, last touched by [fingerprintslast].") + explode() + return + // Whichever number is smallest gets set as the prob + // Each spook adds a 0.5% to 1% chance of burnout + else if(prob(min(40, switchcount / 10))) + burnout() + return + + use_power = ACTIVE_POWER_USE + set_light(BR, PO, CO) + if(play_sound) + playsound(src, 'sound/machines/light_on.ogg', 60, TRUE) + /obj/machinery/light/proc/burnout() status = LIGHT_BURNED icon_state = "[base_state]-burned" @@ -404,7 +434,7 @@ brightness_color = L.brightness_color lightmaterials = L.materials on = has_power() - update() + update(TRUE, TRUE, FALSE) user.drop_item() //drop the item to update overlays and such qdel(L) @@ -538,13 +568,13 @@ if(status != LIGHT_OK) break on = FALSE - update(FALSE) + update(FALSE, TRUE, FALSE) sleep(rand(1, 3)) on = (status == LIGHT_OK) - update(FALSE) + update(FALSE, TRUE, FALSE) sleep(rand(1, 10)) on = (status == LIGHT_OK) - update(FALSE) + update(FALSE, TRUE, FALSE) flickering = FALSE @@ -620,7 +650,7 @@ user.put_in_active_hand(L) status = LIGHT_EMPTY - update(FALSE) + update() return L /obj/machinery/light/attack_tk(mob/user) @@ -649,8 +679,8 @@ if(status == LIGHT_OK) return status = LIGHT_OK - on = 1 - update() + on = TRUE + update(FALSE, TRUE, FALSE) /obj/machinery/light/zap_act(power, zap_flags) var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE @@ -856,3 +886,10 @@ on = FALSE visible_message("[src] flickers and falls dark.") update(FALSE) + +#undef LIGHT_OK +#undef LIGHT_EMPTY +#undef LIGHT_BROKEN +#undef LIGHT_BURNED +#undef LIGHT_ON_DELAY_LOWER +#undef LIGHT_ON_DELAY_UPPER diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 6c3ac951b12..172836f6cdd 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -352,8 +352,6 @@ overlays += "[icon_state]_broken" else overlays += icon_screen - if(cdir > -1) - overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)) /obj/machinery/power/solar_control/attack_ai(mob/user as mob) add_hiddenprint(user) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 996817666ca..e2ac3506855 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -221,7 +221,7 @@ return var/mob/living/carbon/human/H = user var/immune = istype(H.glasses, /obj/item/clothing/glasses/meson) - if(!immune && (get_dist(user, src) < HALLUCINATION_RANGE(power))) + if(!immune && !HAS_TRAIT(H, TRAIT_MESON_VISION) && (get_dist(user, src) < HALLUCINATION_RANGE(power))) . += "You get headaches just from looking at it." /obj/machinery/power/supermatter_crystal/detailed_examine() @@ -537,7 +537,7 @@ //Makes em go mad and accumulate rads. for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power))) // If they can see it without mesons on. Bad on them. - if(!istype(l.glasses, /obj/item/clothing/glasses/meson)) + if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !HAS_TRAIT(l, TRAIT_MESON_VISION)) var/D = sqrt(1 / max(1, get_dist(l, src))) l.hallucination += power * hallucination_power * D l.hallucination = clamp(l.hallucination, 0, 200) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 584079b3c45..d8fc709a656 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -15,6 +15,8 @@ /obj/machinery/power/terminal/Initialize(mapload) . = ..() var/turf/T = get_turf(src) + if(T.transparent_floor) + return if(level == 1) hide(T.intact) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 06e522733e2..ec854602ab9 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -53,7 +53,7 @@ fire_sound = 'sound/magic/staff_door.ogg' /obj/item/gun/magic/staff/slipping - name = "wand of slipping" + name = "staff of slipping" desc = "An artefact that spits... bananas?" ammo_type = /obj/item/ammo_casing/magic/slipping icon_state = "staffofslipping" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 08e7b79ac33..5e0f6ffcf09 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -51,7 +51,7 @@ user.visible_message("[user] zaps [user.p_them()]self with [src].") playsound(user, fire_sound, 50, 1) user.create_attack_log("[key_name(user)] zapped [user.p_them()]self with a [src]") - add_attack_logs(null, user, "zapped [user.p_them()]self with a [src]", ATKLOG_ALL) + add_attack_logs(user, user, "zapped [user.p_them()]self with a [src]", ATKLOG_ALL) ///////////////////////////////////// //WAND OF DEATH @@ -182,7 +182,7 @@ desc = "This wand shoots... banana peels?" fire_sound = 'sound/items/bikehorn.ogg' ammo_type = /obj/item/ammo_casing/magic/slipping - icon_state = "staffofslipping" + icon_state = "wandofslipping" max_charges = 5 //5, 4, 3, 2 /obj/item/gun/magic/wand/slipping/zap_self(mob/living/user) diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 452023946ae..459c6681aa2 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -81,7 +81,7 @@ if(!istype(user_turf)) return 0 var/obj/dummy = new(user_turf) - dummy.pass_flags |= PASSTABLE & PASSGLASS & PASSGRILLE //Grille/Glass so it can be used through common windows + dummy.pass_flags |= PASSTABLE & PASSGLASS & PASSGRILLE & PASSFENCE //Grille/Glass so it can be used through common windows for(var/turf/turf in getline(user_turf,target)) if(turf.density) qdel(dummy) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b8e1348fb43..1be7bc9d95c 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -142,8 +142,8 @@ /obj/item/projectile/beam/immolator/on_hit(atom/target, blocked = 0) . = ..() - if(istype(target, /mob/living/carbon)) - var/mob/living/carbon/M = target + if(isliving(target)) + var/mob/living/M = target M.adjust_fire_stacks(1) M.IgniteMob() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 512f9188606..19efbbc35d5 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -275,7 +275,7 @@ return M.create_attack_log("[key_name(M)] became [new_mob.real_name].") - add_attack_logs(null, M, "became [new_mob.real_name]", ATKLOG_ALL) + add_attack_logs(M, M, "became [new_mob.real_name]", ATKLOG_ALL) new_mob.a_intent = INTENT_HARM if(M.mind) diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index f03ae9b316b..c5f4a2b63bf 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -915,8 +915,8 @@ name = "Gimlet" id = "gimlet" result = "gimlet" - required_reagents = list("gin" = 1, "limejuice" = 1) - result_amount = 2 + required_reagents = list("gin" = 1, "limejuice" = 1, "sugar" = 1) + result_amount = 3 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' /datum/chemical_reaction/sidecar diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index b2afa9c06e3..cb875dce0cf 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -691,6 +691,7 @@ armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) damage_deflection = 10 flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + plane = FLOOR_PLANE layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes var/base_icon_state // initial icon state on map @@ -757,6 +758,9 @@ // update the icon_state to reflect hidden status /obj/structure/disposalpipe/proc/update() var/turf/T = get_turf(src) + if(T.transparent_floor) + update_icon() + return hide(T.intact && !istype(T, /turf/space)) // space never hides pipes update_icon() @@ -889,15 +893,20 @@ /obj/structure/disposalpipe/attackby(obj/item/I, mob/user, params) var/turf/T = get_turf(src) - if(T.intact) - return // prevent interaction with T-scanner revealed pipes + if(T.intact || T.transparent_floor) + to_chat(user, "You can't interact with something that's under the floor!") + return // prevent interaction with T-scanner revealed pipes and pipes under glass add_fingerprint(user) /obj/structure/disposalpipe/welder_act(mob/user, obj/item/I) . = TRUE + var/turf/T = get_turf(src) if(!I.tool_use_check(user, 0)) return + if(T.transparent_floor) + to_chat(user, "You can't interact with something that's under the floor!") + return WELDER_ATTEMPT_SLICING_MESSAGE if(!I.use_tool(src, user, 30, volume = I.tool_volume)) return @@ -1201,7 +1210,7 @@ return var/turf/T = src.loc - if(T.intact) + if(T.intact || T.transparent_floor) return // prevent interaction with T-scanner revealed pipes src.add_fingerprint(user) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 83b09e5c228..4c7f1e94ca1 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -11,19 +11,17 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). container_type = OPENCONTAINER categories = list( - "AI Modules", - "Computer Boards", - "Engineering Machinery", - "Exosuit Modules", - "Hydroponics Machinery", - "Medical Machinery", - "Misc. Machinery", - "Research Machinery", - "Subspace Telecomms", - "Teleportation Machinery" - ) - - reagents = new() + "AI Modules", + "Computer Boards", + "Engineering Machinery", + "Exosuit Modules", + "Hydroponics Machinery", + "Medical Machinery", + "Misc. Machinery", + "Research Machinery", + "Subspace Telecomms", + "Teleportation Machinery" + ) /obj/machinery/r_n_d/circuit_imprinter/New() ..() @@ -33,8 +31,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/reagent_containers/glass/beaker(null) component_parts += new /obj/item/reagent_containers/glass/beaker(null) + create_reagents() RefreshParts() - reagents.my_atom = src /obj/machinery/r_n_d/circuit_imprinter/upgraded/New() ..() @@ -45,7 +43,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) RefreshParts() - reagents.my_atom = src + +/obj/machinery/r_n_d/circuit_imprinter/Destroy() + if(linked_console) + linked_console.linked_imprinter = null + return ..() /obj/machinery/r_n_d/circuit_imprinter/RefreshParts() reagents.maximum_volume = 0 diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index f91b8f2012b..7ce266b522a 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -72,6 +72,16 @@ build_path = /obj/item/defibrillator category = list("Medical") +/datum/design/compact_defib + name = "Compact Defibrillator" + desc = "A belt-mounted defibrillator for rapid deployment." + id = "compact_defib" + req_tech = list("materials" = 7, "biotech" = 7, "powerstorage" = 6) + build_type = PROTOLATHE + materials = list(MAT_METAL = 10000, MAT_GLASS = 4000, MAT_SILVER = 2000) + build_path = /obj/item/defibrillator/compact + category = list("Medical") + /datum/design/defib_mount name = "Defibrillator Wall Mount" desc = "A wall mount for defibrillator units." diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 41b7fedd6db..5423f41a236 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -29,6 +29,11 @@ Note: Must be placed within 3 tiles of the R&D Console component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) RefreshParts() +/obj/machinery/r_n_d/destructive_analyzer/Destroy() + if(linked_console) + linked_console.linked_destroy = null + return ..() + /obj/machinery/r_n_d/destructive_analyzer/RefreshParts() var/T = 0 for(var/obj/item/stock_parts/S in component_parts) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 3c2e2cfda0c..4ceacf94301 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -60,14 +60,16 @@ GLOBAL_LIST_EMPTY(message_servers) var/active = TRUE var/decryptkey = "password" -/obj/machinery/message_server/New() +/obj/machinery/message_server/Initialize(mapload) + . = ..() GLOB.message_servers += src decryptkey = GenerateKey() send_pda_message("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.") - ..() /obj/machinery/message_server/Destroy() GLOB.message_servers -= src + QDEL_LIST(pda_msgs) + QDEL_LIST(rc_msgs) return ..() /obj/machinery/message_server/process() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 263e67dd795..0f69a938734 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -14,19 +14,16 @@ Note: Must be placed west/left of and R&D console to function. container_type = OPENCONTAINER categories = list( - "Bluespace", - "Equipment", - "Janitorial", - "Medical", - "Mining", - "Miscellaneous", - "Power", - "Stock Parts", - "Weapons" - ) - - reagents = new() - + "Bluespace", + "Equipment", + "Janitorial", + "Medical", + "Mining", + "Miscellaneous", + "Power", + "Stock Parts", + "Weapons" + ) /obj/machinery/r_n_d/protolathe/New() ..() @@ -38,10 +35,9 @@ Note: Must be placed west/left of and R&D console to function. component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) + create_reagents() RefreshParts() - reagents.my_atom = src - /obj/machinery/r_n_d/protolathe/upgraded/New() ..() component_parts = list() @@ -54,7 +50,10 @@ Note: Must be placed west/left of and R&D console to function. component_parts += new /obj/item/reagent_containers/glass/beaker/large(null) RefreshParts() - reagents.my_atom = src +/obj/machinery/r_n_d/protolathe/Destroy() + if(linked_console) + linked_console.linked_lathe = null + return ..() /obj/machinery/r_n_d/protolathe/RefreshParts() var/T = 0 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index ffa8ac763de..03c916e8b69 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -176,6 +176,20 @@ won't update every console in existence) but it's more of a hassle to do. Also, SyncRDevices() /obj/machinery/computer/rdconsole/Destroy() + QDEL_NULL(files) + QDEL_NULL(t_disk) + QDEL_NULL(d_disk) + QDEL_LIST(matching_designs) + if(linked_destroy) + linked_destroy.linked_console = null + linked_destroy = null + if(linked_lathe) + linked_lathe.linked_console = null + linked_lathe = null + if(linked_imprinter) + linked_imprinter.linked_console = null + linked_imprinter = null + if(wait_message_timer) deltimer(wait_message_timer) wait_message_timer = 0 diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index ac78e892c7e..3fba5e8093a 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -32,12 +32,17 @@ wires["Black"] = 0 wires["White"] = 0 var/list/w = list("Red","Blue","Green","Yellow","Black","White") - src.hack_wire = pick(w) - w -= src.hack_wire - src.shock_wire = pick(w) - w -= src.shock_wire - src.disable_wire = pick(w) - w -= src.disable_wire + hack_wire = pick_n_take(w) + shock_wire = pick_n_take(w) + disable_wire = pick_n_take(w) + +/obj/machinery/r_n_d/Destroy() + if(loaded_item) + loaded_item.forceMove(get_turf(src)) + loaded_item = null + linked_console = null + materials = null + return ..() /obj/machinery/r_n_d/attack_hand(mob/user as mob) if(shocked) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index b597af644f9..d4b4f5fc929 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -340,7 +340,7 @@ /obj/item/organ/internal/cyberimp/arm/surgery, /obj/item/organ/internal/cyberimp/chest/nutriment ) - belt = /obj/item/defibrillator/compact/loaded + belt = /obj/item/defibrillator/compact/advanced/loaded l_pocket = /obj/item/reagent_containers/hypospray/safety/ert r_pocket = /obj/item/melee/classic_baton/telescopic @@ -369,7 +369,7 @@ mask = /obj/item/clothing/mask/gas/sechailer/swat suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 - belt = /obj/item/defibrillator/compact/loaded + belt = /obj/item/defibrillator/compact/advanced/loaded l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites r_pocket = /obj/item/reagent_containers/hypospray/autoinjector diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index d3d4be7dff9..c9bf85eaac4 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -33,7 +33,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur switch(level) if(SEC_LEVEL_GREEN) - GLOB.security_announcement_down.Announce("All threats to the station have passed. All weapons need to be holstered and privacy laws are once again fully enforced.","Attention! Security level lowered to green.") + GLOB.security_announcement_down.Announce("All threats to the station have passed. All weapons need to be holstered and privacy laws are once again fully enforced.","Attention! Security level lowered to green.", 'sound/AI/green.ogg') GLOB.security_level = SEC_LEVEL_GREEN post_status("alert", "outline") @@ -45,9 +45,9 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur if(SEC_LEVEL_BLUE) if(GLOB.security_level < SEC_LEVEL_BLUE) - GLOB.security_announcement_up.Announce("The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible and random searches are permitted.","Attention! Security level elevated to blue.") + GLOB.security_announcement_up.Announce("The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible and random searches are permitted.","Attention! Security level elevated to blue.", 'sound/AI/blue.ogg') else - GLOB.security_announcement_down.Announce("The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.","Attention! Security level lowered to blue.") + GLOB.security_announcement_down.Announce("The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.","Attention! Security level lowered to blue.", 'sound/AI/blue.ogg') GLOB.security_level = SEC_LEVEL_BLUE post_status("alert", "outline") @@ -59,9 +59,9 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur if(SEC_LEVEL_RED) if(GLOB.security_level < SEC_LEVEL_RED) - GLOB.security_announcement_up.Announce("There is an immediate and serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.","Attention! Code Red!") + GLOB.security_announcement_up.Announce("There is an immediate and serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.","Attention! Code Red!", 'sound/AI/red.ogg') else - GLOB.security_announcement_down.Announce("The station's self-destruct mechanism has been deactivated, but there is still an immediate and serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.","Attention! Code Red!") + GLOB.security_announcement_down.Announce("The station's self-destruct mechanism has been deactivated, but there is still an immediate and serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.","Attention! Code Red!", 'sound/AI/red.ogg') GLOB.security_level = SEC_LEVEL_RED var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in GLOB.airlocks @@ -77,7 +77,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur FA.overlays += image('icons/obj/monitors.dmi', "overlay_red") if(SEC_LEVEL_GAMMA) - GLOB.security_announcement_up.Announce("Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location.", "Attention! Gamma security level activated!", sound('sound/effects/new_siren.ogg')) + GLOB.security_announcement_up.Announce("Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location.", "Attention! Gamma security level activated!", 'sound/effects/new_siren.ogg', new_sound2 = 'sound/AI/gamma.ogg') GLOB.security_level = SEC_LEVEL_GAMMA if(GLOB.security_level < SEC_LEVEL_RED) @@ -95,7 +95,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur FA.update_icon() if(SEC_LEVEL_EPSILON) - GLOB.security_announcement_up.Announce("Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.","Attention! Epsilon security level activated!", new_sound = sound('sound/effects/purge_siren.ogg')) + GLOB.security_announcement_up.Announce("Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.","Attention! Epsilon security level activated!", 'sound/effects/purge_siren.ogg', new_sound2 = 'sound/AI/epsilon.ogg') GLOB.security_level = SEC_LEVEL_EPSILON post_status("alert", "epsilonalert") @@ -106,7 +106,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur FA.overlays += image('icons/obj/monitors.dmi', "overlay_epsilon") if(SEC_LEVEL_DELTA) - GLOB.security_announcement_up.Announce("The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.","Attention! Delta security level reached!", new_sound = sound('sound/effects/deltaalarm.ogg')) + GLOB.security_announcement_up.Announce("The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.","Attention! Delta security level reached!", 'sound/effects/deltaalarm.ogg', new_sound2 = 'sound/AI/delta.ogg') GLOB.security_level = SEC_LEVEL_DELTA post_status("alert", "deltaalert") diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 8a5c2118794..f9c3edf437c 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -86,12 +86,15 @@ travelDir = 0 var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself - var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/shuttledock.ogg')) - var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/shuttlecalled.ogg')) - var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/shuttlerecalled.ogg')) + var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/eshuttle_dock.ogg')) + var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/eshuttle_call.ogg')) + var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/eshuttle_recall.ogg')) var/canRecall = TRUE //no bad condom, do not recall the crew transfer shuttle! + var/datum/announcement/priority/crew_shuttle_called = new(0, new_sound = sound('sound/AI/cshuttle.ogg')) + var/datum/announcement/priority/crew_shuttle_docked = new(0, new_sound = sound('sound/AI/cshuttle_dock.ogg')) + /obj/docking_port/mobile/emergency/register() if(!..()) @@ -146,9 +149,10 @@ SSshuttle.emergencyLastCallLoc = signalOrigin else SSshuttle.emergencyLastCallLoc = null - - emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]") - + if(canRecall) + emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]") + else + crew_shuttle_called.Announce("The crew transfer shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason]") /obj/docking_port/mobile/emergency/cancel(area/signalOrigin) if(!canRecall) @@ -230,7 +234,10 @@ return mode = SHUTTLE_DOCKED timer = world.time - emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.") + if(canRecall) + emergency_shuttle_docked.Announce("The emergency shuttle has docked with the station. You have [timeLeft(600)] minutes to board the emergency shuttle.") + else + crew_shuttle_docked.Announce("The crew transfer shuttle has docked with the station. You have [timeLeft(600)] minutes to board the crew transfer shuttle.") /* //Gangs only have one attempt left if the shuttle has docked with the station to prevent suffering from dominator delays diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm index 6e6898bde1f..9bdf10d9407 100644 --- a/code/modules/station_goals/bluespace_tap.dm +++ b/code/modules/station_goals/bluespace_tap.dm @@ -326,7 +326,7 @@ else if(input_level > desired_level) input_level-- if(prob(input_level - safe_levels + (emagged * 5))) //at dangerous levels, start doing freaky shit. prob with values less than 0 treat it as 0 - GLOB.event_announcement.Announce("Unexpected power spike during Bluespace Harvester Operation. Extra-dimensional intruder alert. Expected location: [get_area(src).name]. [emagged ? "DANGER: Emergency shutdown failed! Please proceed with manual shutdown." : "Emergency shutdown initiated."]", "Bluespace Harvester Malfunction") + GLOB.event_announcement.Announce("Unexpected power spike during Bluespace Harvester Operation. Extra-dimensional intruder alert. Expected location: [get_area(src).name]. [emagged ? "DANGER: Emergency shutdown failed! Please proceed with manual shutdown." : "Emergency shutdown initiated."]", "Bluespace Harvester Malfunction", 'sound/AI/harvester.ogg') if(!emagged) input_level = 0 //emergency shutdown unless we're sabotaged desired_level = 0 diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 0a046c3dcff..cfb8a3367f8 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -28,7 +28,7 @@ return FALSE /obj/machinery/bsa - icon = 'icons/obj/machines/particle_accelerator3.dmi' + icon = 'icons/obj/machines/particle_accelerator.dmi' density = 1 anchored = 1 @@ -260,7 +260,7 @@ var/target use_power = NO_POWER_USE circuit = /obj/item/circuitboard/computer/bsa_control - icon = 'icons/obj/machines/particle_accelerator3.dmi' + icon = 'icons/obj/machines/particle_accelerator.dmi' icon_state = "control_boxp" var/icon_state_broken = "control_box" var/icon_state_nopower = "control_boxw" diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm index 9812c3d8fc6..3e252b67fb8 100644 --- a/code/modules/surgery/organs/subtypes/diona.dm +++ b/code/modules/surgery/organs/subtypes/diona.dm @@ -18,28 +18,28 @@ max_damage = 35 min_broken_damage = 20 amputation_point = "upper left trunk" - convertable_children = list(/obj/item/organ/external/arm/diona) + convertable_children = list(/obj/item/organ/external/hand/diona) /obj/item/organ/external/arm/right/diona name = "right upper tendril" max_damage = 35 min_broken_damage = 20 amputation_point = "upper right trunk" - convertable_children = list(/obj/item/organ/external/arm/right/diona) + convertable_children = list(/obj/item/organ/external/hand/right/diona) /obj/item/organ/external/leg/diona name = "left lower tendril" max_damage = 35 min_broken_damage = 20 amputation_point = "lower left fork" - convertable_children = list(/obj/item/organ/external/leg/diona) + convertable_children = list(/obj/item/organ/external/foot/diona) /obj/item/organ/external/leg/right/diona name = "right lower tendril" max_damage = 35 min_broken_damage = 20 amputation_point = "lower right fork" - convertable_children = list(/obj/item/organ/external/leg/right/diona) + convertable_children = list(/obj/item/organ/external/foot/right/diona) /obj/item/organ/external/foot/diona name = "left foot" diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm index 87323fc2042..e5d089c7fe9 100644 --- a/code/modules/vehicle/ambulance.dm +++ b/code/modules/vehicle/ambulance.dm @@ -12,6 +12,11 @@ AA = new(src) soundloop = new(list(src), FALSE) +/obj/vehicle/ambulance/Destroy() + QDEL_NULL(AA) + QDEL_NULL(soundloop) + return ..() + /datum/action/ambulance_alarm name = "Toggle Sirens" icon_icon = 'icons/obj/vehicles.dmi' diff --git a/dreamchecker.exe b/dreamchecker.exe index 2fa602138fd..5203df4047c 100644 Binary files a/dreamchecker.exe and b/dreamchecker.exe differ diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png index e6de831a97d..153dd1519b4 100644 Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index dd893450d75..63a203345ae 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi index a0a8445964a..7747d55af60 100644 Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index a0b551e83bd..b5659069b65 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 39636bd7bab..f712201f5e4 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/biogenerator.dmi b/icons/obj/biogenerator.dmi index 02cf868a31f..7989d6f355f 100644 Binary files a/icons/obj/biogenerator.dmi and b/icons/obj/biogenerator.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 042b5fe7f38..7157f054dc7 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/computer3.dmi b/icons/obj/computer3.dmi deleted file mode 100644 index 30705076d62..00000000000 Binary files a/icons/obj/computer3.dmi and /dev/null differ diff --git a/icons/obj/defib.dmi b/icons/obj/defib.dmi new file mode 100644 index 00000000000..ca471bd5ffa Binary files /dev/null and b/icons/obj/defib.dmi differ diff --git a/icons/obj/fence.dmi b/icons/obj/fence.dmi new file mode 100644 index 00000000000..132482b4874 Binary files /dev/null and b/icons/obj/fence.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 3cb9250df9e..3905a885990 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi index 3fe76915f16..e4153046565 100644 Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 3cb9e63cb38..fdb7ec1d0a7 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index d00d1d4fb94..fd2b776aa43 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index e0db0804fa6..ce0beb1b201 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/machines/HONKputer.dmi b/icons/obj/machines/HONKputer.dmi deleted file mode 100644 index 921f6cf219f..00000000000 Binary files a/icons/obj/machines/HONKputer.dmi and /dev/null differ diff --git a/icons/obj/machines/am_engine.dmi b/icons/obj/machines/am_engine.dmi deleted file mode 100644 index 9d32bb0d406..00000000000 Binary files a/icons/obj/machines/am_engine.dmi and /dev/null differ diff --git a/icons/obj/machines/antenna.dmi b/icons/obj/machines/antenna.dmi deleted file mode 100644 index 5bf1e318a7c..00000000000 Binary files a/icons/obj/machines/antenna.dmi and /dev/null differ diff --git a/icons/obj/machines/antimatter.dmi b/icons/obj/machines/antimatter.dmi deleted file mode 100644 index a4be203e1a3..00000000000 Binary files a/icons/obj/machines/antimatter.dmi and /dev/null differ diff --git a/icons/obj/machines/broadcast.dmi b/icons/obj/machines/broadcast.dmi deleted file mode 100644 index c2c7ba0f61f..00000000000 Binary files a/icons/obj/machines/broadcast.dmi and /dev/null differ diff --git a/icons/obj/machines/fiber.dmi b/icons/obj/machines/fiber.dmi deleted file mode 100644 index c75fd6482ea..00000000000 Binary files a/icons/obj/machines/fiber.dmi and /dev/null differ diff --git a/icons/obj/machines/heavy_fiber.dmi b/icons/obj/machines/heavy_fiber.dmi deleted file mode 100644 index 8bd8d0747d1..00000000000 Binary files a/icons/obj/machines/heavy_fiber.dmi and /dev/null differ diff --git a/icons/obj/machines/lasers.dmi b/icons/obj/machines/lasers.dmi deleted file mode 100644 index 1925fb40860..00000000000 Binary files a/icons/obj/machines/lasers.dmi and /dev/null differ diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 83c12986772..d6fc1afd716 100644 Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ diff --git a/icons/obj/machines/netcable.dmi b/icons/obj/machines/netcable.dmi deleted file mode 100644 index 5e2bc3208b4..00000000000 Binary files a/icons/obj/machines/netcable.dmi and /dev/null differ diff --git a/icons/obj/machines/netobjs.dmi b/icons/obj/machines/netobjs.dmi deleted file mode 100644 index f13172260ca..00000000000 Binary files a/icons/obj/machines/netobjs.dmi and /dev/null differ diff --git a/icons/obj/machines/particle_accelerator.dmi b/icons/obj/machines/particle_accelerator.dmi index f8455d80b49..31e1b92eaf6 100644 Binary files a/icons/obj/machines/particle_accelerator.dmi and b/icons/obj/machines/particle_accelerator.dmi differ diff --git a/icons/obj/machines/particle_accelerator2.dmi b/icons/obj/machines/particle_accelerator2.dmi deleted file mode 100644 index d0263af5ad9..00000000000 Binary files a/icons/obj/machines/particle_accelerator2.dmi and /dev/null differ diff --git a/icons/obj/machines/particle_accelerator3.dmi b/icons/obj/machines/particle_accelerator3.dmi deleted file mode 100644 index c601b8d1b6a..00000000000 Binary files a/icons/obj/machines/particle_accelerator3.dmi and /dev/null differ diff --git a/icons/obj/machines/washing_machine.dmi b/icons/obj/machines/washing_machine.dmi index ef80dac0d8a..e3fae0828ab 100644 Binary files a/icons/obj/machines/washing_machine.dmi and b/icons/obj/machines/washing_machine.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 5652b1f6e9b..4d9983203a2 100755 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi index 3526ebc215c..8eed649cb05 100644 Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index bb3c0e531b0..57d99a2a02f 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/turf/floors/glass.dmi b/icons/turf/floors/glass.dmi new file mode 100644 index 00000000000..1d0f13d0c06 Binary files /dev/null and b/icons/turf/floors/glass.dmi differ diff --git a/icons/turf/floors/plasmaglass.dmi b/icons/turf/floors/plasmaglass.dmi new file mode 100644 index 00000000000..629d8be41ec Binary files /dev/null and b/icons/turf/floors/plasmaglass.dmi differ diff --git a/icons/turf/floors/plastitaniumglass.dmi b/icons/turf/floors/plastitaniumglass.dmi new file mode 100644 index 00000000000..39a56f32b00 Binary files /dev/null and b/icons/turf/floors/plastitaniumglass.dmi differ diff --git a/icons/turf/floors/reinf_glass.dmi b/icons/turf/floors/reinf_glass.dmi new file mode 100644 index 00000000000..c5072fd11e0 Binary files /dev/null and b/icons/turf/floors/reinf_glass.dmi differ diff --git a/icons/turf/floors/reinf_plasmaglass.dmi b/icons/turf/floors/reinf_plasmaglass.dmi new file mode 100644 index 00000000000..c46025e5291 Binary files /dev/null and b/icons/turf/floors/reinf_plasmaglass.dmi differ diff --git a/icons/turf/floors/titaniumglass.dmi b/icons/turf/floors/titaniumglass.dmi new file mode 100644 index 00000000000..597487ff175 Binary files /dev/null and b/icons/turf/floors/titaniumglass.dmi differ diff --git a/paradise.dme b/paradise.dme index b6861bb6feb..7c5da49fd52 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1059,6 +1059,7 @@ #include "code\game\objects\structures\engicart.dm" #include "code\game\objects\structures\extinguisher.dm" #include "code\game\objects\structures\false_walls.dm" +#include "code\game\objects\structures\fence.dm" #include "code\game\objects\structures\flora.dm" #include "code\game\objects\structures\fluff.dm" #include "code\game\objects\structures\foodcart.dm" @@ -1079,6 +1080,7 @@ #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\noticeboard.dm" #include "code\game\objects\structures\plasticflaps.dm" +#include "code\game\objects\structures\railings.dm" #include "code\game\objects\structures\reflector.dm" #include "code\game\objects\structures\safe.dm" #include "code\game\objects\structures\signs.dm" @@ -1154,6 +1156,7 @@ #include "code\game\turfs\simulated\floor\misc_floor.dm" #include "code\game\turfs\simulated\floor\plasteel_floor.dm" #include "code\game\turfs\simulated\floor\plating.dm" +#include "code\game\turfs\simulated\floor\transparent.dm" #include "code\game\turfs\space\space.dm" #include "code\game\turfs\space\transit.dm" #include "code\game\verbs\ooc.dm" @@ -1175,6 +1178,7 @@ #include "code\modules\admin\holder2.dm" #include "code\modules\admin\IsBanned.dm" #include "code\modules\admin\machine_upgrade.dm" +#include "code\modules\admin\mute.dm" #include "code\modules\admin\NewBan.dm" #include "code\modules\admin\outfits.dm" #include "code\modules\admin\player_panel.dm" diff --git a/sound/AI/alert.ogg b/sound/AI/alert.ogg new file mode 100644 index 00000000000..66218bb12a4 Binary files /dev/null and b/sound/AI/alert.ogg differ diff --git a/sound/AI/aliens.ogg b/sound/AI/aliens.ogg index f7d1746247f..998cc724357 100644 Binary files a/sound/AI/aliens.ogg and b/sound/AI/aliens.ogg differ diff --git a/sound/AI/animes.ogg b/sound/AI/animes.ogg index a46a207edc4..0e393fbb29f 100644 Binary files a/sound/AI/animes.ogg and b/sound/AI/animes.ogg differ diff --git a/sound/AI/anomaly.ogg b/sound/AI/anomaly.ogg new file mode 100644 index 00000000000..78a6b48c169 Binary files /dev/null and b/sound/AI/anomaly.ogg differ diff --git a/sound/AI/anomaly_bluespace.ogg b/sound/AI/anomaly_bluespace.ogg new file mode 100644 index 00000000000..457344dd0fa Binary files /dev/null and b/sound/AI/anomaly_bluespace.ogg differ diff --git a/sound/AI/anomaly_flux.ogg b/sound/AI/anomaly_flux.ogg new file mode 100644 index 00000000000..ef95486b3f4 Binary files /dev/null and b/sound/AI/anomaly_flux.ogg differ diff --git a/sound/AI/anomaly_gravity.ogg b/sound/AI/anomaly_gravity.ogg new file mode 100644 index 00000000000..eb90d040ed4 Binary files /dev/null and b/sound/AI/anomaly_gravity.ogg differ diff --git a/sound/AI/anomaly_pyro.ogg b/sound/AI/anomaly_pyro.ogg new file mode 100644 index 00000000000..cbed0ce1b8b Binary files /dev/null and b/sound/AI/anomaly_pyro.ogg differ diff --git a/sound/AI/anomaly_vortex.ogg b/sound/AI/anomaly_vortex.ogg new file mode 100644 index 00000000000..24483546263 Binary files /dev/null and b/sound/AI/anomaly_vortex.ogg differ diff --git a/sound/AI/attention.ogg b/sound/AI/attention.ogg index 912be4425eb..d8a0b98a4aa 100644 Binary files a/sound/AI/attention.ogg and b/sound/AI/attention.ogg differ diff --git a/sound/AI/blue.ogg b/sound/AI/blue.ogg new file mode 100644 index 00000000000..bfbd0a50b93 Binary files /dev/null and b/sound/AI/blue.ogg differ diff --git a/sound/AI/brand_intelligence.ogg b/sound/AI/brand_intelligence.ogg new file mode 100644 index 00000000000..bd35a794bab Binary files /dev/null and b/sound/AI/brand_intelligence.ogg differ diff --git a/sound/AI/commandreport.ogg b/sound/AI/commandreport.ogg index 82e4ca425de..91569bf738a 100644 Binary files a/sound/AI/commandreport.ogg and b/sound/AI/commandreport.ogg differ diff --git a/sound/AI/cshuttle.ogg b/sound/AI/cshuttle.ogg new file mode 100644 index 00000000000..7c6f04e0e0a Binary files /dev/null and b/sound/AI/cshuttle.ogg differ diff --git a/sound/AI/cshuttle_dock.ogg b/sound/AI/cshuttle_dock.ogg new file mode 100644 index 00000000000..7018743fab4 Binary files /dev/null and b/sound/AI/cshuttle_dock.ogg differ diff --git a/sound/AI/delam.ogg b/sound/AI/delam.ogg new file mode 100644 index 00000000000..b1822b5a69f Binary files /dev/null and b/sound/AI/delam.ogg differ diff --git a/sound/AI/delta.ogg b/sound/AI/delta.ogg new file mode 100644 index 00000000000..5ed127bc694 Binary files /dev/null and b/sound/AI/delta.ogg differ diff --git a/sound/AI/door_runtimes.ogg b/sound/AI/door_runtimes.ogg new file mode 100644 index 00000000000..d67b6568b3b Binary files /dev/null and b/sound/AI/door_runtimes.ogg differ diff --git a/sound/AI/door_runtimes_fix.ogg b/sound/AI/door_runtimes_fix.ogg new file mode 100644 index 00000000000..1508ff9d027 Binary files /dev/null and b/sound/AI/door_runtimes_fix.ogg differ diff --git a/sound/AI/elec_storm.ogg b/sound/AI/elec_storm.ogg new file mode 100644 index 00000000000..b4a417eacd4 Binary files /dev/null and b/sound/AI/elec_storm.ogg differ diff --git a/sound/AI/epsilon.ogg b/sound/AI/epsilon.ogg new file mode 100644 index 00000000000..0ef61026881 Binary files /dev/null and b/sound/AI/epsilon.ogg differ diff --git a/sound/AI/eshuttle_call.ogg b/sound/AI/eshuttle_call.ogg new file mode 100644 index 00000000000..90bbc5c59d0 Binary files /dev/null and b/sound/AI/eshuttle_call.ogg differ diff --git a/sound/AI/eshuttle_dock.ogg b/sound/AI/eshuttle_dock.ogg new file mode 100644 index 00000000000..246a0a603a4 Binary files /dev/null and b/sound/AI/eshuttle_dock.ogg differ diff --git a/sound/AI/eshuttle_recall.ogg b/sound/AI/eshuttle_recall.ogg new file mode 100644 index 00000000000..bcbcbbaec2e Binary files /dev/null and b/sound/AI/eshuttle_recall.ogg differ diff --git a/sound/AI/flare.ogg b/sound/AI/flare.ogg new file mode 100644 index 00000000000..7eafb3f832b Binary files /dev/null and b/sound/AI/flare.ogg differ diff --git a/sound/AI/gamma.ogg b/sound/AI/gamma.ogg new file mode 100644 index 00000000000..4738f1c8959 Binary files /dev/null and b/sound/AI/gamma.ogg differ diff --git a/sound/AI/granomalies.ogg b/sound/AI/granomalies.ogg deleted file mode 100644 index 89b368d596a..00000000000 Binary files a/sound/AI/granomalies.ogg and /dev/null differ diff --git a/sound/AI/green.ogg b/sound/AI/green.ogg new file mode 100644 index 00000000000..44cb4108976 Binary files /dev/null and b/sound/AI/green.ogg differ diff --git a/sound/AI/harvester.ogg b/sound/AI/harvester.ogg new file mode 100644 index 00000000000..a10b308ed09 Binary files /dev/null and b/sound/AI/harvester.ogg differ diff --git a/sound/AI/intercept.ogg b/sound/AI/intercept.ogg index 3569a07d401..30dba660681 100644 Binary files a/sound/AI/intercept.ogg and b/sound/AI/intercept.ogg differ diff --git a/sound/AI/intercept2.ogg b/sound/AI/intercept2.ogg deleted file mode 100644 index ab106a7295a..00000000000 Binary files a/sound/AI/intercept2.ogg and /dev/null differ diff --git a/sound/AI/ions.ogg b/sound/AI/ions.ogg new file mode 100644 index 00000000000..f92c8b0b050 Binary files /dev/null and b/sound/AI/ions.ogg differ diff --git a/sound/AI/ionstorm.ogg b/sound/AI/ionstorm.ogg deleted file mode 100644 index 9f39713de6e..00000000000 Binary files a/sound/AI/ionstorm.ogg and /dev/null differ diff --git a/sound/AI/meteors.ogg b/sound/AI/meteors.ogg index 8f1c3aeacbb..e49b92065e6 100644 Binary files a/sound/AI/meteors.ogg and b/sound/AI/meteors.ogg differ diff --git a/sound/AI/newai.ogg b/sound/AI/newai.ogg deleted file mode 100644 index 35aba34564f..00000000000 Binary files a/sound/AI/newai.ogg and /dev/null differ diff --git a/sound/AI/newroundsexy.ogg b/sound/AI/newroundsexy.ogg index afe5630f04d..1e7242dbff2 100644 Binary files a/sound/AI/newroundsexy.ogg and b/sound/AI/newroundsexy.ogg differ diff --git a/sound/AI/newroundsexy2.ogg b/sound/AI/newroundsexy2.ogg deleted file mode 100644 index 531bba10014..00000000000 Binary files a/sound/AI/newroundsexy2.ogg and /dev/null differ diff --git a/sound/AI/outbreak3.ogg b/sound/AI/outbreak3.ogg new file mode 100644 index 00000000000..c4f6668e634 Binary files /dev/null and b/sound/AI/outbreak3.ogg differ diff --git a/sound/AI/outbreak5.ogg b/sound/AI/outbreak5.ogg index 39c79c920fd..1eb03a059dd 100644 Binary files a/sound/AI/outbreak5.ogg and b/sound/AI/outbreak5.ogg differ diff --git a/sound/AI/outbreak7.ogg b/sound/AI/outbreak7.ogg index f21d4fca443..a394dc9417e 100644 Binary files a/sound/AI/outbreak7.ogg and b/sound/AI/outbreak7.ogg differ diff --git a/sound/AI/power_overload.ogg b/sound/AI/power_overload.ogg new file mode 100644 index 00000000000..913cae054a3 Binary files /dev/null and b/sound/AI/power_overload.ogg differ diff --git a/sound/AI/power_restore.ogg b/sound/AI/power_restore.ogg new file mode 100644 index 00000000000..0758d786cc3 Binary files /dev/null and b/sound/AI/power_restore.ogg differ diff --git a/sound/AI/poweroff.ogg b/sound/AI/poweroff.ogg deleted file mode 100644 index 1c6377c9d8d..00000000000 Binary files a/sound/AI/poweroff.ogg and /dev/null differ diff --git a/sound/AI/poweron.ogg b/sound/AI/poweron.ogg deleted file mode 100644 index 9d18797d6ea..00000000000 Binary files a/sound/AI/poweron.ogg and /dev/null differ diff --git a/sound/AI/radiation.ogg b/sound/AI/radiation.ogg index ef395af3101..d60bec74b05 100644 Binary files a/sound/AI/radiation.ogg and b/sound/AI/radiation.ogg differ diff --git a/sound/AI/red.ogg b/sound/AI/red.ogg new file mode 100644 index 00000000000..3f7ad4ce9e3 Binary files /dev/null and b/sound/AI/red.ogg differ diff --git a/sound/AI/scrubbers.ogg b/sound/AI/scrubbers.ogg new file mode 100644 index 00000000000..ccdb40949c3 Binary files /dev/null and b/sound/AI/scrubbers.ogg differ diff --git a/sound/AI/shuttlecalled.ogg b/sound/AI/shuttlecalled.ogg deleted file mode 100644 index 716bf824654..00000000000 Binary files a/sound/AI/shuttlecalled.ogg and /dev/null differ diff --git a/sound/AI/shuttledock.ogg b/sound/AI/shuttledock.ogg deleted file mode 100644 index 0f70bebc751..00000000000 Binary files a/sound/AI/shuttledock.ogg and /dev/null differ diff --git a/sound/AI/shuttlerecalled.ogg b/sound/AI/shuttlerecalled.ogg deleted file mode 100644 index 5f6db404b87..00000000000 Binary files a/sound/AI/shuttlerecalled.ogg and /dev/null differ diff --git a/sound/AI/spanomalies.ogg b/sound/AI/spanomalies.ogg index 7680726f153..44f249c24ab 100644 Binary files a/sound/AI/spanomalies.ogg and b/sound/AI/spanomalies.ogg differ diff --git a/sound/AI/welcome.ogg b/sound/AI/welcome.ogg index c7013dcbd5f..87354bf38e8 100644 Binary files a/sound/AI/welcome.ogg and b/sound/AI/welcome.ogg differ diff --git a/sound/effects/footstep/glass1.ogg b/sound/effects/footstep/glass1.ogg new file mode 100644 index 00000000000..7afddff640a Binary files /dev/null and b/sound/effects/footstep/glass1.ogg differ diff --git a/sound/effects/footstep/glass2.ogg b/sound/effects/footstep/glass2.ogg new file mode 100644 index 00000000000..5bac4625b68 Binary files /dev/null and b/sound/effects/footstep/glass2.ogg differ diff --git a/sound/effects/footstep/glass3.ogg b/sound/effects/footstep/glass3.ogg new file mode 100644 index 00000000000..5d355e8ef17 Binary files /dev/null and b/sound/effects/footstep/glass3.ogg differ diff --git a/sound/effects/footstep/glassbarefoot1.ogg b/sound/effects/footstep/glassbarefoot1.ogg new file mode 100644 index 00000000000..7dd8d9e5371 Binary files /dev/null and b/sound/effects/footstep/glassbarefoot1.ogg differ diff --git a/sound/effects/footstep/glassbarefoot2.ogg b/sound/effects/footstep/glassbarefoot2.ogg new file mode 100644 index 00000000000..b82c3e0d9d1 Binary files /dev/null and b/sound/effects/footstep/glassbarefoot2.ogg differ diff --git a/sound/effects/footstep/glassbarefoot3.ogg b/sound/effects/footstep/glassbarefoot3.ogg new file mode 100644 index 00000000000..317bf53fcc8 Binary files /dev/null and b/sound/effects/footstep/glassbarefoot3.ogg differ diff --git a/sound/machines/light_on.ogg b/sound/machines/light_on.ogg new file mode 100644 index 00000000000..2442739a040 Binary files /dev/null and b/sound/machines/light_on.ogg differ diff --git a/sound/machines/lightswitch.ogg b/sound/machines/lightswitch.ogg new file mode 100644 index 00000000000..e91a6c3030c Binary files /dev/null and b/sound/machines/lightswitch.ogg differ diff --git a/tools/announcement_voice_filter/.bitwig-project b/tools/announcement_voice_filter/.bitwig-project new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tools/announcement_voice_filter/README.md b/tools/announcement_voice_filter/README.md new file mode 100644 index 00000000000..db389ad1183 --- /dev/null +++ b/tools/announcement_voice_filter/README.md @@ -0,0 +1,17 @@ +# AI Announcement Voice Effects Template +This template file helps apply the correct sound effects to generate further Station AI announcement messages. + +--- + +### Requirements +You need a copy (full or trial) of Bitwig Studio 3.x, and access to Amazon Polly's free tier. If you are using a trial version of Bitwig Studio, you also require a free audio editor such as Audacity. + + +### Amazon Polly +Plain text, Standard engine, Englush US, Joanna - Female. + + +### Bitwig studio +All you need to do is drag your generated polly voice into the project. +Ensure the tempo is 114.4 for your track. +Record or export the output directly to OGG (if you own a license) or to a free editor such as Audacity via loopback recording diff --git a/tools/announcement_voice_filter/StationAI.bwproject b/tools/announcement_voice_filter/StationAI.bwproject new file mode 100644 index 00000000000..a7fc00a20b9 Binary files /dev/null and b/tools/announcement_voice_filter/StationAI.bwproject differ diff --git a/tools/mapmerge2/requirements.txt b/tools/mapmerge2/requirements.txt index f46bdc31d5f..7687c0746ed 100644 --- a/tools/mapmerge2/requirements.txt +++ b/tools/mapmerge2/requirements.txt @@ -1,3 +1,3 @@ pygit2==1.0.1 bidict==0.13.1 -Pillow==8.2.0 +Pillow==8.3.2