diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5ffbce661a6..e8e7bf3cdd2 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -17,7 +17,21 @@ /turf/space, /area/space/nearstation) "abv" = ( -/obj/machinery/power/tracker, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/auxsolarstarboard) +"abQ" = ( +/turf/simulated/floor/plating, +/area/security/permabrig) +"ace" = ( +/obj/machinery/power/solar{ + name = "Aft Starboard Solar Panel" + }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -26,37 +40,30 @@ icon_state = "solarpanel" }, /area/maintenance/auxsolarstarboard) -"abQ" = ( -/turf/simulated/floor/plating, -/area/security/permabrig) -"ace" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) "acf" = ( /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, +/area/maintenance/auxsolarstarboard) +"acg" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; @@ -66,7 +73,7 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"acg" = ( +"ach" = ( /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -74,12 +81,12 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"ach" = ( +"aci" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"aci" = ( +"acj" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -87,12 +94,11 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"acj" = ( +"aco" = ( /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -107,19 +113,16 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarstarboard) -"aco" = ( -/obj/machinery/power/solar{ - name = "Aft Starboard Solar Panel" +"acp" = ( +/obj/machinery/power/tracker, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/obj/structure/cable, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, /area/maintenance/auxsolarstarboard) -"acp" = ( -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) "acC" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -140,24 +143,31 @@ /area/hallway/secondary/entry) "acE" = ( /obj/structure/cable{ + d1 = 1; d2 = 8; - icon_state = "0-8" + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /obj/structure/lattice/catwalk, /turf/space, -/area/space/nearstation) +/area/maintenance/auxsolarstarboard) "acF" = ( /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "acG" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/power/solar{ + name = "Aft Starboard Solar Panel" }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) +/obj/structure/cable, +/turf/simulated/floor/plasteel/airless{ + icon_state = "solarpanel" + }, +/area/maintenance/auxsolarstarboard) "acJ" = ( /obj/docking_port/stationary{ dheight = 9; @@ -211,13 +221,17 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "adg" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/auxsolarstarboard) "adh" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "adt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -246,7 +260,6 @@ /area/hallway/secondary/entry) "adx" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -258,11 +271,13 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "adz" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "adK" = ( /obj/machinery/light/small{ dir = 4 @@ -286,7 +301,6 @@ /area/hallway/secondary/entry) "adO" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -320,18 +334,13 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aec" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "solar_chapel_airlock"; - name = "exterior access button"; - pixel_x = -25; - pixel_y = -25; - req_access_txt = "10;13" +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "aed" = ( /obj/docking_port/mobile/pod{ id = "pod1"; @@ -341,6 +350,7 @@ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, +/obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aee" = ( @@ -358,7 +368,11 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeg" = ( -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aey" = ( /obj/machinery/light/small{ @@ -379,12 +393,18 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "aeB" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/auxsolarstarboard) +/obj/effect/decal/warning_stripes/east, +/obj/machinery/status_display{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "aeC" = ( -/obj/effect/spawner/window/reinforced, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/hallway/secondary/entry) "aeI" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -406,23 +426,14 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_4) "aeL" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "brown" - }, -/area/hallway/secondary/entry) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_4) "aeM" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" - }, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, /area/hallway/secondary/entry) "aeN" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "brown" - }, +/turf/simulated/floor/plating, /area/hallway/secondary/entry) "aeO" = ( /obj/machinery/door/firedoor, @@ -437,37 +448,27 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aeQ" = ( -/obj/machinery/camera{ - c_tag = "Fore Starboard Solars"; - network = list("SS13","Engineering") +/obj/docking_port/mobile/pod{ + dir = 4; + id = "pod4"; + name = "escape pod 4" }, -/obj/machinery/atmospherics/unary/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "afa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/radio/intercom{ + pixel_y = 28 }, -/obj/machinery/door/airlock/engineering{ - name = "Aux Construction Site" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "afb" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -480,6 +481,104 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "afd" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/machinery/light, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) +"afe" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_4) +"aff" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) +"afg" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/auxsolarstarboard) +"afh" = ( +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"afi" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"afj" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/northeast, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"afk" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "brown" + }, +/area/hallway/secondary/entry) +"afl" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/hallway/secondary/entry) +"afm" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "brown" + }, +/area/hallway/secondary/entry) +"afn" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/item/radio/intercom{ + pixel_y = 28 + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"afw" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 15; + id = "admin_home"; + name = "port bay 1"; + width = 18 + }, +/turf/space, +/area/space) +"afx" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/smes, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"afy" = ( +/obj/machinery/camera{ + c_tag = "Fore Starboard Solars"; + network = list("SS13","Engineering") + }, +/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/decal/warning_stripes/northeast, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"afz" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, /obj/item/wrench, @@ -488,7 +587,7 @@ icon_state = "brown" }, /area/hallway/secondary/entry) -"afe" = ( +"afB" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -502,7 +601,7 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry) -"aff" = ( +"afC" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -516,7 +615,14 @@ icon_state = "brown" }, /area/hallway/secondary/entry) -"afg" = ( +"afJ" = ( +/obj/machinery/status_display{ + pixel_x = -32 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"afM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -531,11 +637,33 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarstarboard) -"afh" = ( +"afN" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"afO" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/structure/sign/vacuum{ + pixel_y = 32 + }, +/obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"afi" = ( +/turf/simulated/floor/plating, +/area/maintenance/disposal) +"afP" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -545,23 +673,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"afj" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"afk" = ( +"afQ" = ( /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 @@ -578,12 +699,11 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"afl" = ( +"afR" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -597,212 +717,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"afm" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1379; - id_tag = "solar_chapel_pump" - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "solar_chapel_airlock"; - pixel_y = 25; - req_access_txt = "13"; - tag_airpump = "solar_chapel_pump"; - tag_chamber_sensor = "solar_chapel_sensor"; - tag_exterior_door = "solar_chapel_outer"; - tag_interior_door = "solar_chapel_inner" - }, -/obj/machinery/airlock_sensor{ - id_tag = "solar_chapel_sensor"; - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) -"afn" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/airlock/external{ - frequency = 1379; - id_tag = "solar_chapel_outer"; - locked = 1; - name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) -"afw" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 15; - id = "admin_home"; - name = "port bay 1"; - width = 18 - }, -/turf/space, -/area/space) -"afx" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Starboard Arrivals Storage"; - dir = 4; - pixel_y = -22 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "brown" - }, -/area/hallway/secondary/entry) -"afy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) -"afz" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/hallway/secondary/entry) -"afB" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) -"afC" = ( -/obj/structure/cable, -/obj/effect/decal/warning_stripes/southeast, -/obj/machinery/power/solar_control{ - dir = 8; - id = "auxsolareast"; - name = "Fore Starboard Solar Control" - }, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) -"afJ" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"afK" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"afM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) -"afN" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"afO" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "garbage" - }, -/obj/structure/sign/vacuum{ - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes/south, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/disposal) -"afP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/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 = 8; - icon_state = "brown" - }, -/area/hallway/secondary/entry) -"afQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) -"afR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/hallway/secondary/entry) "agd" = ( /obj/machinery/light{ dir = 8 @@ -833,7 +747,6 @@ /area/hallway/secondary/entry) "agg" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -844,7 +757,6 @@ /area/hallway/secondary/entry) "agh" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -866,57 +778,85 @@ /turf/simulated/floor/plating/airless, /area/shuttle/arrival/station) "agm" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1379; + id_tag = "solar_chapel_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "solar_chapel_airlock"; + pixel_y = 25; + req_access_txt = "13"; + tag_airpump = "solar_chapel_pump"; + tag_chamber_sensor = "solar_chapel_sensor"; + tag_exterior_door = "solar_chapel_outer"; + tag_interior_door = "solar_chapel_inner" + }, +/obj/machinery/airlock_sensor{ + id_tag = "solar_chapel_sensor"; + pixel_y = 32 + }, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"agn" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/airlock/external{ + frequency = 1379; + id_tag = "solar_chapel_outer"; + locked = 1; + name = "Engineering External Access"; + req_access_txt = "10;13" + }, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) +"ago" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "solar_chapel_airlock"; + name = "exterior access button"; + pixel_x = -25; + pixel_y = -25; + req_access_txt = "10;13" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/auxsolarstarboard) +"agp" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard, /obj/machinery/light{ dir = 8 }, /obj/machinery/camera{ - c_tag = "Arrivals Fore Starboard"; + c_tag = "Starboard Arrivals Storage"; dir = 4; pixel_y = -22 }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"agn" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/obj/effect/decal/warning_stripes/east, +"agq" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"ago" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/emergency, -/obj/item/crowbar/red, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "brown" - }, -/area/hallway/secondary/entry) -"agp" = ( -/turf/simulated/floor/plasteel{ - icon_state = "brown" - }, -/area/hallway/secondary/entry) -"agq" = ( -/obj/structure/table/reinforced, -/obj/item/analyzer, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, /area/hallway/secondary/entry) "agA" = ( @@ -954,16 +894,10 @@ /turf/simulated/floor/plating, /area/shuttle/arrival/station) "agH" = ( -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1265,8 +1199,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "90Curve" + icon_state = "1-4" }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -1345,22 +1278,15 @@ /area/hallway/secondary/entry) "aka" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akb" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/effect/decal/warning_stripes/east, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "akw" = ( @@ -1451,7 +1377,6 @@ /area/hallway/secondary/entry) "alu" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/camera{ @@ -1483,7 +1408,6 @@ /area/hallway/secondary/entry) "aly" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1508,7 +1432,6 @@ /area/space) "alG" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -1532,7 +1455,6 @@ /area/maintenance/fore2) "alK" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1542,8 +1464,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -1598,7 +1519,7 @@ /obj/structure/table/wood, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -1689,8 +1610,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1982,7 +1902,7 @@ dir = 1 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2210,7 +2130,7 @@ /area/hallway/secondary/entry) "anX" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -32 + pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2271,7 +2191,7 @@ /obj/random/toolbox, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -2289,7 +2209,7 @@ pixel_y = 25 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -2523,7 +2443,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -2543,7 +2463,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -2562,7 +2482,7 @@ "aoY" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /turf/simulated/floor/wood, /area/security/vacantoffice) @@ -2627,11 +2547,11 @@ "apg" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 26 + pixel_x = 24; + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -2665,7 +2585,7 @@ "apl" = ( /obj/structure/filingcabinet, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -3273,7 +3193,7 @@ /area/maintenance/fore) "aqI" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -3854,7 +3774,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/computer/security{ @@ -4249,17 +4168,18 @@ }, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, +/obj/machinery/door/poddoor/preopen{ + id_tag = "innerdisposal" + }, /turf/simulated/floor/plating, /area/maintenance/disposal) "asS" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/warning_stripes/southeast, -/obj/effect/decal/warning_stripes/north, /obj/machinery/mass_driver{ dir = 4; - id_tag = "toxinsdriver" + id_tag = "trash" }, /turf/simulated/floor/plating, /area/maintenance/disposal) @@ -4267,8 +4187,7 @@ /obj/structure/fans/tiny, /obj/effect/decal/warning_stripes/west, /obj/machinery/door/poddoor{ - id_tag = "disposal_door"; - name = "disposals blast door" + id_tag = "trash" }, /turf/simulated/floor/plating, /area/maintenance/disposal) @@ -4276,14 +4195,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, @@ -4337,14 +4254,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; @@ -4372,7 +4287,7 @@ /area/engine/controlroom) "ate" = ( /obj/structure/table/wood, -/obj/item/circuitboard/arcade/battle, +/obj/item/circuitboard/med_data, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -4380,7 +4295,6 @@ /area/maintenance/electrical_shop) "atf" = ( /obj/structure/table/wood, -/obj/item/circuitboard/med_data, /obj/item/airalarm_electronics, /turf/simulated/floor/plasteel{ dir = 5; @@ -4478,7 +4392,7 @@ /obj/structure/table/wood, /obj/item/phone, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4496,7 +4410,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4577,7 +4491,7 @@ "atB" = ( /obj/structure/filingcabinet, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -4602,7 +4516,7 @@ "atD" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4674,8 +4588,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4776,8 +4689,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4788,22 +4700,14 @@ /turf/space, /area/maintenance/auxsolarport) "atV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/chair/stool{ + dir = 1 }, -/obj/structure/chair/stool, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/driver_button{ id_tag = "trash"; name = "Trash Ejector Button"; - pixel_x = -26; - pixel_y = -6 - }, -/obj/machinery/door_control{ - id = "disposal_door"; - pixel_x = -26; - pixel_y = 6 + pixel_x = -26 }, /obj/machinery/light/small{ dir = 8 @@ -4811,19 +4715,18 @@ /turf/simulated/floor/plasteel, /area/maintenance/disposal) "atW" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/disposal) -"atX" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/turf/simulated/floor/plasteel{ + icon_state = "brown" }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, /area/maintenance/disposal) "atY" = ( /obj/machinery/power/solar{ @@ -4911,7 +4814,7 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -4979,7 +4882,7 @@ /obj/item/folder/red, /obj/item/lighter/zippo, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/wood, /area/maintenance/electrical_shop) @@ -5000,9 +4903,6 @@ }, /area/maintenance/fore) "aus" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -5082,41 +4982,19 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "auB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/deliveryChute{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/window/reinforced, +/obj/machinery/door_control{ + id = "innerdisposal"; + name = "Disposal Blast door control"; + pixel_x = -26 + }, /turf/simulated/floor/plasteel, /area/maintenance/disposal) "auC" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "garbage" - }, -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 1; - icon_state = "left"; - name = "Danger: Conveyor Access"; - req_access_txt = "12" - }, +/obj/structure/window/reinforced, /turf/simulated/floor/plasteel, /area/maintenance/disposal) -"auD" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/maintenance/disposal) "auE" = ( /turf/simulated/wall/rust, /area/maintenance/disposal) @@ -5277,17 +5155,7 @@ /area/maintenance/fore) "auZ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/mineral/stacking_machine{ - input_dir = 2; - stack_amt = 10 - }, +/obj/structure/window/reinforced, /turf/simulated/floor/plasteel, /area/maintenance/disposal) "ava" = ( @@ -5458,22 +5326,16 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "avu" = ( -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/northeastcorner, /obj/machinery/conveyor{ dir = 9; id = "garbage" }, +/obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plating, /area/maintenance/disposal) "avv" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/machinery/mineral/stacking_unit_console{ - machinedir = 8; - pixel_x = 32 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -6013,18 +5875,6 @@ "awx" = ( /turf/simulated/wall/rust, /area/security/checkpoint2) -"awy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/wall, -/area/maintenance/fore2) -"awz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/wall, -/area/maintenance/disposal) "awA" = ( /obj/machinery/conveyor{ dir = 1; @@ -6035,18 +5885,12 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "awB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plasteel, /area/maintenance/disposal) "awC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6054,7 +5898,7 @@ /area/maintenance/disposal) "awD" = ( /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 2 }, /obj/structure/disposaloutlet{ dir = 4 @@ -6089,7 +5933,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "awF" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/disposal) @@ -6467,10 +6310,9 @@ /turf/simulated/floor/plating, /area/maintenance/fore2) "axv" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2"; - tag = null +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /obj/structure/cable{ d1 = 4; @@ -6488,9 +6330,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore2) "axw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6502,14 +6341,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/maintenance/fore2) "axx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6525,14 +6364,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/maintenance/disposal) "axy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6544,17 +6383,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) -"axz" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) +"axz" = ( /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{ @@ -6563,17 +6401,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/maintenance/disposal) -"axA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/disposal) +"axA" = ( /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{ @@ -6582,35 +6419,34 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/maintenance/disposal) -"axB" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/disposal) +"axB" = ( /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{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/maintenance/disposal) "axC" = ( -/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/cleanable/dirt, /obj/machinery/alarm{ @@ -6623,27 +6459,23 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "axD" = ( -/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/unary/vent_pump/on{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/maintenance/disposal) "axE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -6728,8 +6560,7 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -6906,7 +6737,7 @@ /obj/item/storage/box/mousetraps, /obj/item/storage/box/mousetraps, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -6967,7 +6798,7 @@ /obj/item/hand_labeler, /obj/item/crowbar, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -7178,13 +7009,6 @@ icon_state = "neutralfull" }, /area/engine/controlroom) -"ayS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/wall, -/area/maintenance/fore2) "ayT" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -7258,9 +7082,6 @@ /turf/simulated/floor/wood, /area/maintenance/fore) "azf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/warning_stripes/northwest, @@ -7338,7 +7159,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel, /area/janitor) @@ -7488,7 +7309,7 @@ "azD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7551,8 +7372,7 @@ /area/quartermaster/storage) "azJ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7592,7 +7412,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7608,8 +7428,7 @@ /area/quartermaster/storage) "azP" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ @@ -8427,6 +8246,7 @@ icon_state = "1-8" }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /obj/item/reagent_containers/glass/bucket, @@ -8654,9 +8474,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -8669,12 +8486,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore2) "aCd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -8687,6 +8504,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -8753,14 +8573,10 @@ /turf/simulated/wall, /area/hydroponics/abandoned_garden) "aCm" = ( -/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 @@ -8834,7 +8650,7 @@ }, /obj/effect/decal/cleanable/vomit, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plating, /area/crew_quarters/toilet) @@ -9285,6 +9101,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -9320,11 +9141,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -9442,11 +9258,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9455,24 +9266,13 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aDP" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/quartermaster/sorting) +/obj/structure/disposalpipe/segment, +/turf/simulated/wall, +/area/quartermaster/office) "aDQ" = ( /turf/simulated/floor/plating, /area/quartermaster/sorting) "aDR" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -9712,6 +9512,11 @@ "aEv" = ( /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/plating, /area/maintenance/fore) "aEw" = ( @@ -9725,11 +9530,6 @@ }, /area/maintenance/fore) "aEx" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -9757,11 +9557,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "aEA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, @@ -9784,16 +9579,14 @@ }, /area/maintenance/fore) "aED" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/cable, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) "aEF" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -9814,11 +9607,6 @@ /turf/simulated/floor/plating, /area/quartermaster/sorting) "aEH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/closet/crate, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -9841,16 +9629,6 @@ /area/quartermaster/sorting) "aEJ" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/fore) @@ -9863,11 +9641,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -9889,7 +9662,7 @@ req_access_txt = "31" }, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aEM" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -9903,7 +9676,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aEN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9916,7 +9689,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aEO" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -9925,20 +9698,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/toilet) "aEP" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/quartermaster/sorting) "aEQ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, @@ -10183,25 +9944,30 @@ }, /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{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFs" = ( /obj/structure/table/wood, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFt" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFu" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -10211,27 +9977,22 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFv" = ( /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFw" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aFx" = ( /turf/simulated/wall, /area/crew_quarters/sleep) "aFy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -10306,11 +10067,6 @@ }, /area/quartermaster/storage) "aFH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/maintenance/fore) @@ -10385,7 +10141,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel, /area/crew_quarters/toilet) @@ -10514,7 +10270,7 @@ /obj/structure/table/reinforced, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -10615,7 +10371,7 @@ "aGn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -10624,12 +10380,12 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGp" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -10640,7 +10396,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10648,7 +10404,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10659,7 +10415,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGs" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "25" @@ -10673,7 +10429,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGv" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ @@ -10681,8 +10437,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 28 + pixel_x = -26 }, /obj/machinery/bottler, /turf/simulated/floor/plasteel{ @@ -10738,7 +10493,7 @@ /obj/structure/table/wood, /obj/item/ammo_box/shotgun/beanbag, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/light_switch{ pixel_x = 26; @@ -10755,7 +10510,9 @@ /obj/structure/sign/barsign{ pixel_y = 32 }, -/obj/machinery/chem_dispenser/soda, +/obj/machinery/chem_dispenser/soda{ + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -10763,7 +10520,9 @@ /area/crew_quarters/bar) "aGB" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/beer, +/obj/machinery/chem_dispenser/beer{ + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -10887,7 +10646,7 @@ "aGL" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, -/area/quartermaster/office) +/area/quartermaster/sorting) "aGN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10930,24 +10689,22 @@ }, /area/quartermaster/storage) "aGT" = ( +/obj/machinery/seed_extractor, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/obj/machinery/seed_extractor, /turf/simulated/floor/plasteel, /area/security/permabrig) "aGV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -11205,21 +10962,21 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHB" = ( /obj/structure/table/wood, /obj/item/paicard, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHC" = ( /obj/structure/closet/wardrobe/mixed, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11241,17 +10998,12 @@ /area/hydroponics/abandoned_garden) "aHH" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHI" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -11342,11 +11094,11 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -11360,22 +11112,17 @@ name = "Bar Junction"; sortType = 19 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHT" = ( /obj/machinery/conveyor{ dir = 4; @@ -11385,23 +11132,14 @@ opacity = 1 }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aHU" = ( /obj/machinery/conveyor{ dir = 4; id = "cargodelivery" }, /turf/simulated/floor/plating, -/area/quartermaster/office) -"aHW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/fore) +/area/quartermaster/sorting) "aHX" = ( /obj/structure/cable{ d1 = 4; @@ -11437,7 +11175,7 @@ }, /obj/structure/disposaloutlet, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aIa" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -11447,25 +11185,24 @@ dir = 9; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aIb" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/structure/chair/sofa, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aIc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -11476,11 +11213,12 @@ dir = 5; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aId" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -11513,7 +11251,7 @@ pixel_y = -8 }, /obj/machinery/camera{ - c_tag = "Medbay Storage"; + c_tag = "Cargo Dock east"; dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -11536,7 +11274,7 @@ id = "cargodelivery" }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aIi" = ( /obj/machinery/conveyor/southwest/ccw{ id = "QMLoad2" @@ -11578,8 +11316,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, @@ -11676,8 +11413,7 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/alarm{ pixel_y = 24 @@ -11695,8 +11431,7 @@ network = list("SS13","Engineering") }, /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -11786,7 +11521,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -11915,13 +11650,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aIS" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -11948,22 +11693,15 @@ /turf/space, /area/space/nearstation) "aIU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light/small{ dir = 4 }, -/obj/effect/decal/warning_stripes/arrow, -/obj/effect/decal/warning_stripes/yellow/partial, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aIV" = ( /obj/structure/cable{ d1 = 1; @@ -12050,13 +11788,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aJf" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -12073,13 +11807,13 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aJh" = ( /obj/machinery/conveyor{ id = "cargodisposals" }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aJi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -12095,7 +11829,7 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aJk" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 8 @@ -12104,7 +11838,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aJm" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/extinguisher_cabinet{ @@ -12178,7 +11912,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aJu" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/securearea{ @@ -12246,8 +11980,7 @@ "aJF" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -12420,8 +12153,7 @@ icon_state = "0-2" }, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -12446,7 +12178,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -12578,16 +12310,6 @@ }, /area/maintenance/fore) "aKg" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -12595,6 +12317,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -12604,14 +12331,14 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aKi" = ( /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aKj" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -12619,7 +12346,7 @@ /obj/structure/bed, /obj/item/bedsheet/orange, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aKk" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ @@ -12629,19 +12356,23 @@ "aKl" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aKm" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /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{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aKn" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -12689,7 +12420,7 @@ "aKr" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ - c_tag = "Bar"; + c_tag = "Bar North"; dir = 4; pixel_y = -22 }, @@ -12735,8 +12466,7 @@ /area/hallway/primary/fore) "aKv" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -12745,7 +12475,7 @@ /obj/structure/table, /obj/machinery/recharger, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aKw" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -12756,7 +12486,7 @@ "aKx" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aKy" = ( /obj/structure/cable{ d1 = 1; @@ -12768,21 +12498,21 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aKz" = ( /obj/machinery/conveyor{ id = "cargodisposals" }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aKB" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aKC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12800,7 +12530,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aKE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -12808,7 +12538,7 @@ req_access_txt = "31" }, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/quartermaster/office) "aKF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -13155,7 +12885,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -13205,11 +12935,6 @@ }, /area/maintenance/fore) "aLD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light/small{ dir = 4 }, @@ -13221,10 +12946,10 @@ "aLE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLF" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -13233,13 +12958,13 @@ dir = 5 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13248,7 +12973,7 @@ dir = 5 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLI" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "25" @@ -13260,7 +12985,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -13268,11 +12993,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLL" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -13283,8 +13013,7 @@ pixel_x = -24 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -13381,7 +13110,7 @@ dir = 9; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aLX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13409,7 +13138,7 @@ dir = 1; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aLZ" = ( /obj/structure/cable{ d1 = 1; @@ -13424,7 +13153,7 @@ dir = 5; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aMa" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -13434,15 +13163,13 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aMb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/cable{ d1 = 2; @@ -13468,7 +13195,7 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -13481,7 +13208,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aMe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -13489,7 +13216,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aMf" = ( /obj/structure/closet/crate/internals, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -13613,7 +13340,7 @@ }, /obj/machinery/power/terminal, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -13652,7 +13379,7 @@ /obj/structure/dresser, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aME" = ( /obj/structure/cable{ d1 = 1; @@ -13715,7 +13442,7 @@ /area/engine/controlroom) "aMN" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/radiation, @@ -13800,8 +13527,7 @@ pixel_x = 32 }, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13843,7 +13569,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNb" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -13858,11 +13584,11 @@ /obj/machinery/light, /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNd" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNe" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -13873,18 +13599,18 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aNg" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"aNg" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -13893,13 +13619,13 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNh" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -13933,7 +13659,7 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNm" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -13950,7 +13676,7 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow, @@ -13959,17 +13685,8 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNq" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, /obj/structure/chair{ dir = 1 }, @@ -13977,13 +13694,8 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aNr" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -13991,7 +13703,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aNs" = ( /obj/machinery/light{ dir = 4 @@ -14012,7 +13724,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aNt" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -14034,18 +13746,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Supply Break Room"; req_access_txt = "31" }, /turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/area/quartermaster/office) "aNw" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow, @@ -14067,7 +13774,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNy" = ( /obj/machinery/conveyor_switch/oneway{ id = "cargodisposals"; @@ -14081,7 +13788,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aND" = ( /obj/structure/cable{ d1 = 1; @@ -14208,7 +13915,6 @@ }, /area/security/permabrig) "aNO" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/storage/box/donkpockets, /turf/simulated/floor/plasteel{ @@ -14306,7 +14012,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNY" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel{ @@ -14317,7 +14023,7 @@ "aNZ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/alarm{ dir = 8; @@ -14380,7 +14086,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOg" = ( /turf/simulated/wall/r_wall, /area/atmos) @@ -14437,7 +14143,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aOo" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -14507,7 +14213,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/quartermaster/office) "aOx" = ( /turf/simulated/wall, /area/crew_quarters/theatre) @@ -14583,7 +14289,6 @@ /area/crew_quarters/bar) "aOI" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -14600,14 +14305,14 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOK" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOL" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14617,36 +14322,31 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOM" = ( /obj/machinery/status_display, /turf/simulated/wall, -/area/quartermaster/office) +/area/quartermaster/sorting) "aON" = ( /obj/machinery/conveyor{ id = "cargodisposals" }, /obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOO" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aOP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aOQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14843,8 +14543,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/igniter{ id = "Incinerator"; @@ -14952,7 +14651,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPx" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ @@ -14962,12 +14661,10 @@ /area/atmos) "aPy" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -14976,7 +14673,7 @@ /area/atmos) "aPz" = ( /obj/item/radio/intercom{ - pixel_y = 22 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15046,8 +14743,7 @@ /area/atmos) "aPG" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15125,12 +14821,12 @@ }, /obj/structure/closet/secure_closet/clown, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPQ" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons{ @@ -15139,12 +14835,12 @@ }, /obj/item/storage/fancy/crayons, /obj/machinery/camera{ - c_tag = "Theatre Backstage" + c_tag = "Clown and Mime office" }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPR" = ( /obj/structure/cable{ d2 = 2; @@ -15162,7 +14858,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPS" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -15170,7 +14866,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPT" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ @@ -15183,7 +14879,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -15263,7 +14959,7 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQf" = ( /obj/structure/cable{ d1 = 4; @@ -15283,7 +14979,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQg" = ( /obj/structure/cable{ d1 = 2; @@ -15303,7 +14999,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQh" = ( /obj/structure/cable{ d1 = 1; @@ -15314,11 +15010,13 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQi" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/structure/plasticflaps, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/quartermaster/office) "aQj" = ( /obj/machinery/door/airlock/medical{ @@ -15341,25 +15039,20 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aQl" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "brown" }, -/area/quartermaster/storage) +/area/quartermaster/sorting) "aQm" = ( /obj/machinery/vending/snack, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aQn" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -15390,7 +15083,7 @@ /obj/item/pen, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15398,6 +15091,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/maintenance/gambling_den) "aQr" = ( @@ -15421,7 +15119,7 @@ "aQt" = ( /obj/structure/chair/stool/bar, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -15433,7 +15131,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/southwestcorner, @@ -15457,6 +15154,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) "aQx" = ( @@ -15536,9 +15238,11 @@ }, /area/security/execution) "aQK" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -15628,7 +15332,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -15737,7 +15441,7 @@ /area/atmos) "aRa" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -22 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/shower{ @@ -15905,7 +15609,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRq" = ( /obj/effect/landmark/start{ name = "Clown" @@ -15914,7 +15618,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRr" = ( /obj/structure/cable{ d1 = 1; @@ -15924,7 +15628,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15936,37 +15640,19 @@ icon_state = "bar" }, /area/crew_quarters/bar) -"aRt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aRu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/maintenance/fore) "aRv" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light/small{ dir = 4 }, @@ -15974,7 +15660,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aRw" = ( /obj/structure/table/wood, /obj/item/camera, @@ -16059,7 +15745,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/item/storage/box, /obj/item/storage/box/lights/mixed{ @@ -16067,18 +15753,18 @@ pixel_y = 4 }, /obj/machinery/light_switch{ - pixel_x = -22; - pixel_y = -22 + dir = 1; + pixel_x = -26; + pixel_y = -26 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRM" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -16092,7 +15778,7 @@ /turf/simulated/floor/plasteel{ icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRN" = ( /obj/structure/cable{ d1 = 1; @@ -16104,7 +15790,7 @@ /turf/simulated/floor/plasteel{ icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRO" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ @@ -16115,14 +15801,14 @@ dir = 6; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRP" = ( /obj/machinery/disposal/deliveryChute{ dir = 1 }, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRQ" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, @@ -16130,25 +15816,20 @@ dir = 10; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aRR" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aRS" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aRT" = ( /obj/structure/cable{ d1 = 4; @@ -16274,6 +15955,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/table/reinforced, /obj/machinery/recharger, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -16344,11 +16026,11 @@ /obj/machinery/door/window/brigdoor/northright{ dir = 2; name = "Justice Chamber"; - req_access_txt = "3" + req_access_txt = "2" }, /obj/machinery/door/window/brigdoor/northright{ name = "Justice Chamber"; - req_access_txt = "3" + req_access_txt = "2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16534,8 +16216,8 @@ "aSR" = ( /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16552,6 +16234,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ + name = "Entertainment Office"; req_access_txt = "46" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16575,7 +16258,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSU" = ( /obj/structure/cable{ d1 = 4; @@ -16589,7 +16272,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSV" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -16608,7 +16291,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSW" = ( /obj/structure/cable{ d1 = 4; @@ -16627,7 +16310,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSX" = ( /obj/structure/cable{ d1 = 4; @@ -16639,7 +16322,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16661,16 +16344,11 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -16678,39 +16356,39 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aTa" = ( -/obj/structure/disposalpipe/junction, /obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"aTa" = ( +/obj/structure/disposalpipe/junction, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aTb" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -16797,12 +16475,12 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Cargo Disposals Sorting"; dir = 1 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aTj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -16824,11 +16502,6 @@ }, /area/hallway/primary/fore) "aTk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -16839,13 +16512,13 @@ icon_state = "pipe-c" }, /turf/simulated/wall, -/area/quartermaster/office) +/area/quartermaster/sorting) "aTn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall, -/area/quartermaster/storage) +/area/quartermaster/office) "aTp" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ @@ -16858,7 +16531,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/quartermaster/office) "aTr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -16978,7 +16651,6 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -17005,6 +16677,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/chair/office/dark{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -17463,45 +17138,44 @@ }, /area/maintenance/gambling_den) "aUs" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/chair/office/dark{ + dir = 4 }, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 }, -/area/maintenance/gambling_den) +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) "aUt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/cable, +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/power/solar_control{ + dir = 8; + id = "auxsolareast"; + name = "Fore Starboard Solar Control" }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/auxsolarstarboard) "aUu" = ( +/obj/machinery/door/airlock/engineering{ + name = "Aux Construction Site" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/gambling_den) +/area/hallway/secondary/entry) "aUv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/fore) @@ -17525,7 +17199,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aUy" = ( /obj/effect/landmark/start{ name = "Mime" @@ -17533,12 +17207,12 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aUz" = ( /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aUA" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -17546,13 +17220,13 @@ /obj/machinery/disposal, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aUB" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17563,27 +17237,18 @@ }, /area/crew_quarters/bar) "aUC" = ( -/obj/effect/decal/warning_stripes/arrow, -/obj/effect/decal/warning_stripes/yellow/partial, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aUD" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aUE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -17666,8 +17331,7 @@ pixel_y = 3 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -17720,7 +17384,7 @@ "aUS" = ( /obj/structure/table, /obj/machinery/camera{ - c_tag = "Medbay Lobby East" + c_tag = "Cargo office" }, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -17759,16 +17423,13 @@ }, /area/quartermaster/office) "aUV" = ( -/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{ - dir = 1; - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aUW" = ( /obj/machinery/light{ dir = 4 @@ -17892,7 +17553,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -17902,8 +17563,7 @@ "aVl" = ( /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Riot Control"; - req_access_txt = "2" + name = "Riot Control" }, /obj/structure/window/reinforced{ dir = 1; @@ -17944,7 +17604,7 @@ }, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 1"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -17975,7 +17635,7 @@ }, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 2"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -18014,7 +17674,7 @@ }, /obj/machinery/camera{ c_tag = "Perma-Brig Cell 3"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -18322,14 +17982,14 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aVZ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/baguette, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWa" = ( /obj/machinery/light, /obj/machinery/alarm{ @@ -18340,7 +18000,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWb" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -18348,7 +18008,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWc" = ( /obj/structure/table/wood, /obj/item/lipstick/random{ @@ -18366,20 +18026,15 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWd" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aWe" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -18728,7 +18383,7 @@ "aWG" = ( /obj/machinery/light, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Cargo Dock south"; dir = 1 }, /obj/effect/decal/warning_stripes/south, @@ -18889,7 +18544,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -18900,7 +18555,7 @@ dir = 5 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -19172,18 +18827,23 @@ /turf/simulated/floor/engine/air, /area/atmos) "aXy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/maintenance/fore) +/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 = 8; + icon_state = "brown" + }, +/area/hallway/secondary/entry) "aXz" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -19191,34 +18851,33 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aXA" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d2 = 2; + icon_state = "0-2" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"aXA" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aXB" = ( /obj/structure/table/wood, /obj/item/twohanded/staff/broom, /obj/item/clothing/head/witchwig, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -19251,8 +18910,7 @@ name = "Theater Stage" }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -19273,7 +18931,6 @@ /area/atmos) "aXH" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -19607,7 +19264,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Prisoner Re-education Centre"; - req_access_txt = "1" + req_access_txt = "2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -19727,7 +19384,8 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19755,7 +19413,7 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -19870,24 +19528,9 @@ /area/maintenance/fore) "aYT" = ( /obj/structure/cable{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/sortjunction{ @@ -19929,32 +19572,27 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore) "aYX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aYY" = ( /obj/structure/cable{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"aYY" = ( /obj/effect/landmark{ name = "lightsout" }, @@ -19966,7 +19604,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aYZ" = ( /turf/simulated/wall, /area/crew_quarters/kitchen) @@ -19979,7 +19617,7 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Atrium"; + c_tag = "Bar South"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -19992,7 +19630,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -20092,11 +19730,12 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_x = -24; - pixel_y = -24 + pixel_x = -26; + pixel_y = -26 }, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -20168,7 +19807,7 @@ pixel_x = -24 }, /obj/machinery/camera{ - c_tag = "Cargo Office SouthWest"; + c_tag = "Cargo Dock SouthWest"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20200,8 +19839,8 @@ /obj/machinery/photocopier, /obj/machinery/firealarm{ dir = 1; - pixel_x = -24; - pixel_y = -24 + pixel_x = -26; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -20220,8 +19859,7 @@ /obj/machinery/light, /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -20233,7 +19871,7 @@ pixel_y = -24 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Quartermaster Office"; dir = 1 }, /turf/simulated/floor/plasteel{ @@ -20266,12 +19904,17 @@ "aZE" = ( /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -20279,6 +19922,11 @@ "aZF" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/warning_stripes/north, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -20292,6 +19940,11 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -20302,6 +19955,11 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -20486,7 +20144,7 @@ icon_state = "2-8" }, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -20552,7 +20210,6 @@ "aZZ" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -20832,11 +20489,6 @@ }, /area/hallway/primary/central) "baH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; req_access_txt = "35" @@ -20865,30 +20517,29 @@ "baK" = ( /obj/machinery/door/firedoor, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"baL" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"baL" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "baM" = ( /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -20935,7 +20586,7 @@ "baR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -20982,12 +20633,13 @@ }, /obj/machinery/autolathe, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = -24; - pixel_y = -24 + pixel_x = -26; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -21065,12 +20717,10 @@ pixel_y = 4 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -21161,16 +20811,6 @@ }, /area/crew_quarters/heads/hos) "bbn" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -21178,19 +20818,11 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, +/obj/structure/cable, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/permabrig) "bbo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -21200,11 +20832,6 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "bbp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21215,18 +20842,13 @@ }, /area/security/permabrig) "bbq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21242,11 +20864,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -21340,9 +20957,7 @@ }, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21434,11 +21049,12 @@ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, +/obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbJ" = ( /obj/item/radio/intercom{ - pixel_y = 25 + pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -21606,19 +21222,13 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bce" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/hydroponics) "bcf" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /obj/structure/closet/secure_closet/hydroponics, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21633,8 +21243,7 @@ "bch" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -21660,7 +21269,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/chem_master/condimaster, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21672,31 +21281,25 @@ dir = 4; pixel_y = -22 }, -/obj/effect/decal/warning_stripes/arrow{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"bcm" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central/nw) +"bcm" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bcn" = ( /obj/effect/decal/warning_stripes/yellow, /obj/structure/plasticflaps{ @@ -21729,8 +21332,7 @@ /area/crew_quarters/kitchen) "bcs" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/gibber, /obj/effect/decal/warning_stripes/south, @@ -21837,7 +21439,6 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -21913,8 +21514,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/vending/cargodrobe, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "purple" @@ -22228,11 +21828,6 @@ }, /area/hydroponics) "bdy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; @@ -22240,11 +21835,6 @@ }, /area/hydroponics) "bdz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -22254,25 +21844,23 @@ }, /area/hydroponics) "bdA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "greenblue" - }, -/area/hydroponics) -"bdB" = ( /obj/structure/cable{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) +"bdB" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -22326,7 +21914,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -22355,9 +21942,9 @@ /area/hydroponics) "bdG" = ( /obj/structure/cable{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -22366,21 +21953,21 @@ }, /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" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bdH" = ( /obj/structure/cable{ - d1 = 1; + d1 = 4; d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22392,7 +21979,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bdI" = ( /obj/structure/cable{ d1 = 4; @@ -22555,7 +22142,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -22856,7 +22442,7 @@ "beL" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ @@ -23016,18 +22602,18 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bfd" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bfe" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -23073,7 +22659,7 @@ /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -23177,15 +22763,14 @@ /area/atmos) "bfw" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/table, /obj/item/clipboard, /obj/item/toy/figure/crew/miner, /obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 + dir = 8; + pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -23354,7 +22939,7 @@ /area/security/permabrig) "bfT" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -32 + pixel_y = -28 }, /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/plasteel{ @@ -23602,7 +23187,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bgs" = ( /turf/simulated/wall, /area/maintenance/starboard2) @@ -23780,8 +23365,7 @@ /area/maintenance/fore) "bgM" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/mineral/equipment_vendor, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -23912,15 +23496,15 @@ }, /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" }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitered" @@ -24023,8 +23607,7 @@ /area/atmos) "bho" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Atmospherics South"; @@ -24139,13 +23722,13 @@ /obj/item/toy/figure/crew/botanist, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/hydroponics) "bhC" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -24162,7 +23745,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhF" = ( /obj/structure/cable{ d1 = 1; @@ -24175,7 +23758,7 @@ dir = 1; icon_state = "green" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhG" = ( /obj/machinery/light/small{ dir = 1 @@ -24184,7 +23767,7 @@ dir = 4; icon_state = "red" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhH" = ( /obj/machinery/smartfridge, /turf/simulated/floor/plasteel, @@ -24581,8 +24164,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -24705,8 +24287,7 @@ icon_state = "4-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Security Briefing Room North"; @@ -24761,7 +24342,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/effect/landmark/start{ @@ -25156,7 +24737,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bjn" = ( /obj/structure/cable{ d1 = 1; @@ -25168,7 +24749,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bjo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25180,7 +24761,7 @@ dir = 4; icon_state = "whitehall" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bjp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -25376,7 +24957,7 @@ "bjO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ - c_tag = "Atmospherics South-East"; + c_tag = "Mining Dock"; dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -25483,8 +25064,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 @@ -25503,14 +25083,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; @@ -25639,8 +25217,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Security Interrogation Room"; @@ -25669,7 +25246,7 @@ "bkn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/computer/secure_data{ dir = 8 @@ -25728,8 +25305,7 @@ "bks" = ( /obj/machinery/photocopier, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -25987,7 +25563,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "blc" = ( /obj/structure/cable{ d1 = 1; @@ -25997,13 +25573,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bld" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "ble" = ( /obj/structure/cable{ d1 = 4; @@ -26020,7 +25596,7 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) @@ -26220,7 +25796,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -26379,18 +25955,6 @@ }, /area/construction/hallway) "blR" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; @@ -26398,9 +25962,19 @@ }, /obj/machinery/camera{ c_tag = "Perma-Brig Garden"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/item/reagent_containers/glass/bucket, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -26410,7 +25984,7 @@ /obj/structure/closet/secure_closet/brigdoc, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -26573,8 +26147,7 @@ }, /obj/item/folder/red, /obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 10 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -26587,10 +26160,11 @@ "bml" = ( /obj/structure/dresser, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -26620,7 +26194,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -26839,7 +26413,7 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -26979,7 +26553,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bmY" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -27420,7 +26994,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/east, @@ -27549,7 +27122,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27673,7 +27246,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27712,7 +27285,7 @@ icon_state = "pipe-c" }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -28110,8 +27683,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -28121,8 +27693,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"; @@ -28136,8 +27707,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -28147,8 +27717,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/crew{ dir = 8 @@ -28167,8 +27736,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; @@ -28440,8 +28008,7 @@ "bpQ" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -28617,7 +28184,7 @@ /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel, /area/hydroponics) @@ -28766,7 +28333,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/hologram/holopad, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall15"; location = "hall14" @@ -29570,7 +29136,7 @@ "bsa" = ( /obj/machinery/hydroponics/constructable, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -29666,6 +29232,7 @@ /obj/effect/landmark{ name = "Observer-Start" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -29703,7 +29270,7 @@ "bsr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -29748,27 +29315,26 @@ /obj/machinery/light, /obj/structure/closet/wardrobe/miner, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bsD" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bsE" = ( @@ -29779,6 +29345,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -29796,6 +29368,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -29816,6 +29393,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -29952,15 +29534,15 @@ "bsY" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ - pixel_x = 28; - pixel_y = -30 + pixel_x = 25; + pixel_y = -28 }, /obj/machinery/status_display{ pixel_y = -32 }, /obj/machinery/computer/med_data/laptop, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -30376,7 +29958,6 @@ /area/security/nuke_storage) "btR" = ( /obj/item/radio/intercom{ - pixel_x = -6; pixel_y = -28 }, /obj/effect/decal/warning_stripes/northeast, @@ -30400,16 +29981,6 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btU" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/window/brigdoor{ dir = 1 }, @@ -30437,11 +30008,6 @@ }, /area/security/prisonershuttle) "btW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -30452,16 +30018,6 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/door/window/brigdoor{ dir = 1 @@ -30469,15 +30025,15 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/door/window/brigdoor{ dir = 1 }, /obj/effect/decal/warning_stripes/north, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -30543,8 +30099,7 @@ /area/security/interrogation) "buf" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -30599,7 +30154,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -30732,7 +30287,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -30754,7 +30309,7 @@ /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "escape" @@ -31077,16 +30632,6 @@ /turf/space, /area/space/nearstation) "bvl" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -31094,11 +30639,6 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvm" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) @@ -31169,7 +30709,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -31261,8 +30801,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31285,8 +30824,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 @@ -31396,7 +30934,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -31872,17 +31410,12 @@ }, /area/security/nuke_storage) "bwy" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -31891,13 +31424,23 @@ /obj/structure/chair{ dir = 1 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/prisonershuttle) "bwA" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigEast"; @@ -32001,8 +31544,7 @@ /area/turret_protected/ai) "bwH" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -32111,7 +31653,7 @@ /area/engine/break_room) "bwX" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -32127,10 +31669,10 @@ /obj/structure/closet/firecloset, /obj/machinery/firealarm{ pixel_x = -32; - pixel_y = 24 + pixel_y = 26 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -22 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -32163,7 +31705,7 @@ network = list("SS13","Engineering") }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32249,7 +31791,7 @@ "bxl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -32351,8 +31893,7 @@ "bxw" = ( /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /obj/machinery/computer/monitor, /turf/simulated/floor/plasteel{ @@ -32530,11 +32071,7 @@ }, /area/security/prisonershuttle) "bxL" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, +/obj/structure/cable, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -32542,6 +32079,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonershuttle) "bxM" = ( @@ -32584,7 +32122,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -32624,14 +32162,19 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bya" = ( -/turf/simulated/wall, -/area/space) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/hallway/secondary/entry) "byb" = ( /obj/structure/cable{ d1 = 4; @@ -32655,8 +32198,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) @@ -32669,8 +32211,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) @@ -32686,8 +32227,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) @@ -32800,7 +32340,7 @@ /area/engine/break_room) "byv" = ( /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -33087,7 +32627,6 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/light{ @@ -33166,7 +32705,6 @@ "byY" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -33483,8 +33021,7 @@ pixel_y = 32 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -33508,7 +33045,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -33523,7 +33060,7 @@ charge = 5e+006 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -33725,8 +33262,7 @@ /obj/structure/table/reinforced, /obj/item/mmi, /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -33949,7 +33485,9 @@ /area/security/nuke_storage) "bAK" = ( /obj/machinery/light/small, -/obj/structure/safe, +/obj/structure/safe{ + known_by = list("captain") + }, /obj/item/clothing/head/bearpelt, /obj/item/folder/documents, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, @@ -34375,7 +33913,7 @@ /area/engine/break_room) "bBB" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -34401,8 +33939,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -34475,7 +34012,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -34682,7 +34219,7 @@ /obj/item/clothing/head/welding, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/storage/primary) @@ -34718,8 +34255,7 @@ "bCg" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/item/assembly/igniter, /obj/item/assembly/igniter, @@ -35303,7 +34839,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35334,7 +34869,7 @@ /area/turret_protected/ai) "bCW" = ( /obj/machinery/turretid/lethal{ - check_synth = 1; + control_area = "\improper AI Chamber"; name = "AI Chamber Turret Control"; pixel_x = 5; pixel_y = -24; @@ -35398,7 +34933,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35442,7 +34976,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/northeast, @@ -36225,9 +35759,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/cyan, /area/security/brig) "bEz" = ( /obj/structure/cable{ @@ -36238,9 +35770,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/cyan, /area/security/brig) "bEA" = ( /obj/effect/spawner/window/reinforced, @@ -36268,7 +35798,6 @@ pixel_y = -10 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/effect/landmark/start{ @@ -36392,7 +35921,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -36404,7 +35933,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/alarm{ dir = 1; @@ -36440,16 +35969,11 @@ }, /area/engine/break_room) "bEY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/structure/dresser, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "bEZ" = ( /obj/structure/cable{ d1 = 1; @@ -36484,7 +36008,7 @@ "bFc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -36504,16 +36028,15 @@ /area/engine/break_room) "bFe" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/break_room) "bFf" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28; - pixel_y = 32 + pixel_x = 25; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/northeast, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -36538,7 +36061,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "bFi" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -36588,7 +36111,6 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/micro_laser, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -36665,7 +36187,7 @@ /area/bridge) "bFx" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -36679,7 +36201,7 @@ /area/bridge) "bFz" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36836,7 +36358,7 @@ "bFQ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36974,18 +36496,14 @@ "bGi" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/cyan, /area/security/brig) "bGj" = ( /obj/machinery/flasher{ id = "Cell 3"; pixel_y = -26 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/cyan, /area/security/brig) "bGk" = ( /obj/structure/cable, @@ -37116,7 +36634,7 @@ "bGw" = ( /obj/effect/decal/warning_stripes/southeast, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -37126,9 +36644,10 @@ /obj/item/wrench, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -37520,7 +37039,7 @@ "bGV" = ( /obj/machinery/vending/assist, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/camera{ c_tag = "Primary Tool Storage"; @@ -37642,7 +37161,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "bHh" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/hologram/holopad, @@ -37654,7 +37173,7 @@ "bHi" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -37705,6 +37224,7 @@ /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, +/obj/item/megaphone, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkbluefull" @@ -37749,7 +37269,7 @@ control_area = "\improper AI Upload Chamber"; name = "AI Upload Turret Control"; pixel_y = -24; - req_access = list(75) + req_one_access_txt = "75" }, /turf/simulated/floor/carpet, /area/bridge) @@ -37923,7 +37443,7 @@ /area/maintenance/starboard2) "bHJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/vending/detdrobe, /turf/simulated/floor/plasteel{ @@ -38253,8 +37773,7 @@ /area/crew_quarters/chief) "bIr" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -38278,7 +37797,7 @@ /obj/item/clipboard, /obj/item/gps/engineering, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38298,7 +37817,7 @@ "bIv" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38363,8 +37882,7 @@ /area/engine/break_room) "bIE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -38468,7 +37986,6 @@ "bIQ" = ( /obj/machinery/vending/tool, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow, @@ -38536,7 +38053,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38553,7 +38070,7 @@ /area/bridge/meeting_room) "bJb" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38626,7 +38143,6 @@ /area/crew_quarters/captain) "bJk" = ( /obj/machinery/light_switch{ - pixel_x = 8; pixel_y = 26 }, /obj/machinery/disposal, @@ -38651,14 +38167,13 @@ /area/crew_quarters/captain) "bJm" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bJn" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -38690,8 +38205,7 @@ dir = 1 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -38919,8 +38433,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 @@ -39027,19 +38540,14 @@ }, /area/engine/break_room) "bKa" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "brown" }, -/area/engine/break_room) +/area/hallway/secondary/entry) "bKb" = ( /obj/structure/cable{ d1 = 1; @@ -39056,7 +38564,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/door_control{ id = "transitlock"; @@ -39311,7 +38819,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "bKE" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -39402,7 +38910,7 @@ /area/bridge/meeting_room) "bKM" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/wood, @@ -39431,7 +38939,7 @@ /area/turret_protected/ai_upload) "bKS" = ( /obj/machinery/light_switch{ - pixel_y = 27 + pixel_y = 26 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) @@ -39455,7 +38963,6 @@ /area/turret_protected/ai_upload) "bKV" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /turf/simulated/floor/bluegrid, @@ -39665,11 +39172,11 @@ }, /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" @@ -39782,7 +39289,7 @@ "bLO" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39959,11 +39466,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; initialize_directions = 10 @@ -40068,9 +39570,7 @@ /area/quartermaster/miningdock) "bMo" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -40101,6 +39601,7 @@ /obj/item/pen, /obj/machinery/light, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -40153,8 +39654,7 @@ /area/engine/break_room) "bMz" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/vending/chinese, /turf/simulated/floor/plasteel{ @@ -40167,8 +39667,7 @@ pixel_y = 32 }, /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -1 + pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -40182,7 +39681,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/toolbox/electrical, @@ -40496,7 +39995,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -40506,7 +40005,7 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/multitool, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/light{ dir = 8 @@ -40966,7 +40465,7 @@ "bOh" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40999,15 +40498,6 @@ pixel_x = -3; pixel_y = 6 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -41029,8 +40519,7 @@ "bOp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -41051,7 +40540,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -41070,7 +40559,7 @@ "bOt" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /obj/effect/decal/warning_stripes/yellow, @@ -41083,7 +40572,7 @@ /obj/item/paicard, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/storage/tech) @@ -41211,8 +40700,8 @@ /area/bridge/meeting_room) "bOK" = ( /obj/machinery/newscaster{ - pixel_x = 32; - pixel_y = -32 + pixel_x = 30; + pixel_y = -30 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -41296,7 +40785,6 @@ /area/crew_quarters/captain) "bOV" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -41439,7 +40927,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41449,8 +40937,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - pixel_y = -32 +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41659,8 +41148,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -41732,8 +41220,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/alarm{ pixel_y = 24 @@ -41794,8 +41281,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -41887,10 +41373,11 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light_switch{ - pixel_x = 24 + dir = 8; + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -42009,7 +41496,7 @@ "bQj" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42028,8 +41515,7 @@ /area/crew_quarters/chief) "bQl" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/bed, /obj/item/bedsheet/ce, @@ -42113,7 +41599,7 @@ }, /obj/structure/closet/radiation, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -42208,8 +41694,7 @@ /area/turret_protected/aisat) "bQD" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -42229,7 +41714,6 @@ /area/bridge/meeting_room) "bQF" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/slot_machine, @@ -42452,7 +41936,7 @@ "bRd" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -42637,7 +42121,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43047,16 +42531,10 @@ }, /area/hallway/primary/central) "bSk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" + icon_state = "brown" }, -/area/engine/break_room) +/area/hallway/secondary/entry) "bSl" = ( /obj/item/storage/box/donkpockets, /obj/structure/table, @@ -43185,15 +42663,13 @@ }, /area/hallway/primary/port) "bSB" = ( -/obj/machinery/camera{ - c_tag = "Fore Hallway South"; - dir = 8 - }, +/obj/structure/table/reinforced, +/obj/item/analyzer, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" + dir = 6; + icon_state = "brown" }, -/area/hallway/primary/fore) +/area/hallway/secondary/entry) "bSC" = ( /obj/structure/cable{ d1 = 1; @@ -43248,7 +42724,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43294,8 +42770,8 @@ /area/turret_protected/ai_upload) "bSO" = ( /obj/machinery/keycard_auth{ - pixel_x = -26; - pixel_y = 22 + pixel_x = -24; + pixel_y = 24 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -43370,7 +42846,7 @@ /area/hallway/primary/central) "bSW" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43425,7 +42901,6 @@ /area/turret_protected/aisat) "bTd" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/camera{ @@ -43519,7 +42994,6 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /obj/machinery/light{ @@ -43546,11 +43020,15 @@ /obj/item/flashlight/lamp, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -43593,8 +43071,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -43616,8 +43093,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 @@ -43638,8 +43114,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 @@ -43692,14 +43167,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/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -43933,8 +43406,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 @@ -44132,8 +43604,8 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = -24 + pixel_x = -26; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -44230,11 +43702,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44449,7 +43916,7 @@ "bUR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/keycard_auth{ - pixel_y = 26 + pixel_y = 24 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -44474,7 +43941,7 @@ /area/crew_quarters/captain) "bUW" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /obj/machinery/camera{ @@ -44495,7 +43962,6 @@ /area/crew_quarters/captain) "bUY" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/carpet/black, @@ -44596,8 +44062,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/lattice/catwalk, /turf/space, @@ -44644,7 +44109,7 @@ pixel_y = -22 }, /obj/machinery/turretid/stun{ - control_area = "\improper AI Satellite Antechamber"; + control_area = "\improper AI Satellite"; name = "AI Antechamber Turret Control"; pixel_x = -28; req_access_txt = "75" @@ -44679,8 +44144,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "90Curve" + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -44796,8 +44260,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -44929,7 +44392,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -44986,7 +44449,7 @@ "bVU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -45002,7 +44465,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45114,9 +44577,7 @@ /area/security/warden) "bWi" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -45241,8 +44702,7 @@ /obj/structure/bed, /obj/item/bedsheet/black, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -45253,11 +44713,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "bWu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -45282,7 +44737,7 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45295,7 +44750,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45307,8 +44762,8 @@ pixel_x = 32 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28; - pixel_y = -32 + pixel_x = 25; + pixel_y = -28 }, /obj/machinery/alarm{ dir = 1; @@ -45377,7 +44832,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45734,8 +45189,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -45800,7 +45254,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45845,7 +45299,7 @@ "bXP" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45973,8 +45427,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -46076,7 +45529,6 @@ /area/crew_quarters/captain/bedroom) "bYA" = ( /obj/machinery/light_switch{ - pixel_x = -8; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -46177,6 +45629,14 @@ /area/lawoffice) "bYN" = ( /obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "IAA"; + name = "IAA Privacy Shutters"; + opacity = 0 + }, /turf/simulated/floor/plating, /area/lawoffice) "bYO" = ( @@ -46192,6 +45652,14 @@ req_access_txt = "38" }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "IAA"; + name = "IAA Privacy Shutters"; + opacity = 0 + }, /turf/simulated/floor/wood, /area/lawoffice) "bYP" = ( @@ -46563,11 +46031,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -46634,7 +46097,6 @@ "bZJ" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /obj/machinery/computer/library, @@ -46679,7 +46141,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46689,7 +46151,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 @@ -46706,7 +46168,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46723,7 +46185,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/effect/decal/cleanable/cobweb, /obj/machinery/computer/security/telescreen/entertainment{ @@ -46738,7 +46200,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46788,8 +46249,11 @@ "caa" = ( /obj/structure/table/wood, /obj/machinery/light, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Personnel's Office" +/obj/machinery/photocopier/faxmachine/longrange{ + department = "NT Representative's Office" + }, +/obj/machinery/keycard_auth{ + pixel_x = 24 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -46802,14 +46266,14 @@ /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cad" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cae" = ( /obj/structure/bookcase, @@ -46846,18 +46310,14 @@ "caj" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cak" = ( /obj/machinery/computer/crew, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cal" = ( /obj/structure/closet/secure_closet/blueshield, @@ -46868,7 +46328,6 @@ /obj/item/pinpointer, /obj/item/disk/nuclear, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/carpet/black, @@ -46936,7 +46395,7 @@ "cau" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -46994,7 +46453,7 @@ "caB" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -47012,8 +46471,7 @@ /area/crew_quarters/courtroom) "caD" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 @@ -47036,10 +46494,15 @@ /obj/item/taperecorder, /obj/item/clothing/glasses/sunglasses, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/clipboard, /obj/item/toy/figure/crew/lawyer, +/obj/machinery/door_control{ + id = "IAA"; + name = "Privacy Shutters Control"; + pixel_y = 25 + }, /turf/simulated/floor/wood, /area/lawoffice) "caH" = ( @@ -47073,7 +46536,7 @@ "caK" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/filingcabinet/security, /turf/simulated/floor/wood, @@ -47131,7 +46594,7 @@ "caQ" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -47139,8 +46602,9 @@ pixel_y = -6 }, /obj/machinery/light_switch{ - pixel_x = -37; - pixel_y = 7 + dir = 4; + pixel_x = -36; + pixel_y = 8 }, /obj/machinery/door_control{ id = "hopprivacy"; @@ -47201,8 +46665,7 @@ "caV" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47507,7 +46970,7 @@ /area/engine/engineering) "cbx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/structure/cable/yellow{ d2 = 2; @@ -47530,8 +46993,7 @@ "cbz" = ( /obj/machinery/suit_storage_unit/captain, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/captain/bedroom) @@ -47545,8 +47007,7 @@ "cbE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -47614,7 +47075,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47757,7 +47218,7 @@ pixel_x = -5; pixel_y = 12 }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cbY" = ( /obj/structure/chair/office/dark{ @@ -47766,7 +47227,7 @@ /obj/effect/landmark/start{ name = "Nanotrasen Representative" }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cbZ" = ( /obj/structure/chair/comfy/black{ @@ -47817,9 +47278,7 @@ /area/blueshield) "cce" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "ccf" = ( /obj/structure/chair/office/dark{ @@ -47828,9 +47287,7 @@ /obj/effect/landmark/start{ name = "Blueshield" }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "ccg" = ( /turf/simulated/floor/wood, @@ -47934,7 +47391,7 @@ /obj/structure/table, /obj/machinery/kitchen_machine/microwave, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -48126,8 +47583,7 @@ pixel_y = -7 }, /obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = 5 + pixel_x = -28 }, /obj/machinery/camera{ c_tag = "Magistrate's Office"; @@ -48514,6 +47970,7 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cdI" = ( @@ -48531,12 +47988,12 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cdK" = ( /obj/structure/table/wood, /obj/item/stamp/rep, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cdL" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -48577,9 +48034,7 @@ }, /obj/item/book/manual/sop_command, /obj/item/paper/blueshield, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cdR" = ( /obj/structure/table/wood, @@ -48591,9 +48046,7 @@ pixel_x = 7; pixel_y = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cdS" = ( /obj/machinery/door/window{ @@ -48638,7 +48091,7 @@ "cdX" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ @@ -48658,6 +48111,7 @@ dir = 8 }, /obj/machinery/recharger, +/obj/item/megaphone, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cdZ" = ( @@ -49113,9 +48567,7 @@ "cfh" = ( /obj/machinery/light, /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/structure/cable{ d1 = 4; @@ -49224,7 +48676,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/library) @@ -49251,7 +48703,7 @@ "cfx" = ( /obj/machinery/photocopier, /obj/structure/extinguisher_cabinet{ - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/wood, /area/library) @@ -49264,14 +48716,14 @@ c_tag = "Library Starboard" }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/library) "cfz" = ( /obj/structure/chair/comfy/red, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/wood, /area/library) @@ -49284,8 +48736,8 @@ /obj/structure/closet/radiation, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = -28 + pixel_x = 26; + pixel_y = -26 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -49328,10 +48780,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cfH" = ( -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "cfI" = ( /obj/structure/cable{ @@ -49372,14 +48824,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cfO" = ( -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "cfP" = ( /obj/machinery/light{ @@ -49421,7 +48869,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -49509,6 +48957,10 @@ /obj/structure/table/reinforced, /obj/item/megaphone, /obj/item/taperecorder, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/carpet, /area/magistrateoffice) "cgg" = ( @@ -49529,7 +48981,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -49623,7 +49075,6 @@ "cgo" = ( /obj/structure/closet, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -49638,7 +49089,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49649,6 +49100,10 @@ dir = 8 }, /obj/structure/closet, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49827,7 +49282,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -49923,7 +49378,7 @@ /area/ntrep) "chl" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "chm" = ( /obj/structure/cable{ @@ -49932,7 +49387,8 @@ icon_state = "1-2" }, /obj/machinery/light_switch{ - pixel_x = 25 + dir = 8; + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -49979,7 +49435,8 @@ icon_state = "1-2" }, /obj/machinery/light_switch{ - pixel_x = -25 + dir = 4; + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -49987,9 +49444,7 @@ /area/blueshield) "chr" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "bcarpet05" - }, +/turf/simulated/floor/carpet/blue, /area/blueshield) "chs" = ( /obj/structure/closet{ @@ -50148,7 +49603,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/wood, @@ -50161,6 +49615,10 @@ /area/lawoffice) "chN" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/wood, /area/lawoffice) "chO" = ( @@ -50246,8 +49704,10 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" + }, +/obj/machinery/computer/message_monitor{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50485,7 +49945,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -50511,7 +49971,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/ntrep) @@ -50591,12 +50051,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/cable{ d1 = 1; @@ -50698,7 +50156,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/blueshield) @@ -50747,7 +50205,7 @@ /obj/machinery/firealarm{ dir = 8; pixel_x = -26; - pixel_y = -28 + pixel_y = -26 }, /obj/structure/cable{ d2 = 4; @@ -50947,7 +50405,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/closet/crate, /obj/item/target/syndicate, @@ -50994,8 +50452,7 @@ /area/security/range) "cjx" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plating, /area/security/range) @@ -51259,12 +50716,10 @@ /area/library) "cki" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/cable{ d1 = 1; @@ -51284,21 +50739,14 @@ /turf/simulated/floor/wood, /area/library) "ckl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) +/turf/simulated/floor/plasteel, +/area/maintenance/fore) "ckm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -51320,7 +50768,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -51408,7 +50856,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -51844,11 +51292,6 @@ /turf/simulated/floor/plating, /area/security/range) "clo" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Break Room"; @@ -52013,7 +51456,7 @@ /obj/item/camera_film, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/window/reinforced{ dir = 1 @@ -52026,7 +51469,7 @@ /obj/structure/bed, /obj/item/bedsheet/hop, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -52093,7 +51536,6 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/ian, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/wood, @@ -52274,7 +51716,6 @@ "cmf" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -52464,7 +51905,7 @@ /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -52478,8 +51919,7 @@ /obj/structure/closet/secure_closet/engineering_personal, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28; - pixel_y = -28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -52502,7 +51942,6 @@ /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -52587,7 +52026,7 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -52628,8 +52067,7 @@ "cne" = ( /obj/structure/dispenser, /obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -52698,7 +52136,7 @@ /obj/structure/table/wood, /obj/machinery/computer/library/checkout, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -52708,7 +52146,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/carpet, @@ -52732,7 +52169,7 @@ "cnr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -52756,8 +52193,8 @@ "cnt" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = -24 + dir = 1; + pixel_y = -26 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -52809,8 +52246,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = -24 + dir = 1; + pixel_y = -26 }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, @@ -52975,12 +52412,10 @@ /area/security/range) "cnV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -53460,7 +52895,7 @@ /area/construction/hallway) "cpc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -53770,7 +53205,7 @@ "cpH" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -54197,7 +53632,7 @@ /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -54249,7 +53684,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -54264,14 +53699,12 @@ /area/crew_quarters/locker) "cqx" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Locker Room" }, /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -54331,8 +53764,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -54550,7 +53982,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/light, /obj/machinery/light_switch{ - pixel_x = 4; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -55243,7 +54675,7 @@ "csB" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/item/clipboard, /obj/item/folder/blue, @@ -55664,8 +55096,7 @@ "ctz" = ( /obj/structure/table, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Rec Room Fore" @@ -55722,7 +55153,7 @@ "ctF" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/tank/internals/plasma, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -55796,7 +55227,6 @@ /area/library) "ctN" = ( /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /turf/simulated/floor/plasteel{ @@ -56187,8 +55617,7 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ @@ -56223,8 +55652,7 @@ /area/crew_quarters/locker) "cuC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -56468,8 +55896,7 @@ "cuX" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - pixel_x = -8; - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel, /area/gateway) @@ -56483,13 +55910,11 @@ /area/engine/engine_smes) "cuZ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/suit_storage_unit/engine, /obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -56589,12 +56014,10 @@ /area/library) "cvl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -56602,8 +56025,7 @@ /area/medical/research) "cvm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -56628,7 +56050,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56665,7 +56087,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56688,7 +56110,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -56825,7 +56247,7 @@ amount = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, @@ -56904,12 +56326,10 @@ /area/toxins/lab) "cvU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -56963,25 +56383,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"cwc" = ( -/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{ - icon_state = "white" - }, -/area/medical/medbay) "cwd" = ( /obj/effect/landmark{ name = "lightsout" @@ -57002,8 +56403,7 @@ /area/crew_quarters/locker) "cwk" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) @@ -57272,7 +56672,6 @@ /obj/structure/table/wood, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/folder, @@ -57293,7 +56692,7 @@ "cwQ" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57547,7 +56946,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ @@ -57616,12 +57015,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -57657,8 +57054,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57680,12 +57076,10 @@ /area/crew_quarters/fitness) "cxD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -57717,7 +57111,7 @@ "cxI" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, @@ -57832,7 +57226,7 @@ "cxV" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -57901,7 +57295,7 @@ "cyb" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -58109,7 +57503,6 @@ /area/gateway) "cyz" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -58120,7 +57513,7 @@ "cyA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -58192,7 +57585,6 @@ }, /obj/structure/dispenser/oxygen, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -58339,10 +57731,9 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "cyU" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/structure/closet/secure_closet/personal/cabinet, @@ -58351,17 +57742,16 @@ /obj/item/clothing/under/blacktango, /obj/item/clothing/head/bowlerhat, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cyV" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, @@ -58370,7 +57760,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cyW" = ( /obj/machinery/power/apc{ dir = 1; @@ -58409,8 +57799,7 @@ /area/crew_quarters/sleep) "cyZ" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Cryodorms Fore" @@ -58425,7 +57814,7 @@ "cza" = ( /obj/machinery/cryopod, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -58547,8 +57936,7 @@ "czo" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 + pixel_y = 28 }, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/warning_stripes/yellow, @@ -58997,8 +58385,7 @@ /area/crew_quarters/locker/locker_toilet) "cAg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -59070,10 +58457,10 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cAo" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -59091,7 +58478,7 @@ /area/civilian/barber) "cAq" = ( /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "cAr" = ( /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -59347,7 +58734,6 @@ "cAU" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -59431,7 +58817,7 @@ /obj/item/wrench, /obj/item/grenade/chem_grenade/metalfoam, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -59583,7 +58969,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/storage/belt, /obj/item/radio, @@ -59808,12 +59194,12 @@ "cBV" = ( /obj/structure/chair/office/dark, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cBW" = ( /obj/effect/landmark/start{ name = "Barber" @@ -59844,7 +59230,7 @@ "cBY" = ( /obj/machinery/cryopod/right, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -59931,7 +59317,7 @@ /area/engine/engineering) "cCi" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/yellow, @@ -60005,8 +59391,7 @@ /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -60193,7 +59578,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light, /turf/simulated/floor/carpet, @@ -60237,7 +59622,6 @@ }, /obj/structure/table/wood, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/folder/red, @@ -60252,8 +59636,8 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = -24 + dir = 1; + pixel_y = -26 }, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel, @@ -60392,7 +59776,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cDr" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -60404,7 +59788,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -60513,7 +59897,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/engine/engine_smes) @@ -60685,9 +60069,7 @@ "cEb" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -60812,7 +60194,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cEu" = ( /obj/structure/cable{ d1 = 1; @@ -60921,7 +60303,6 @@ /area/hallway/primary/central) "cEM" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -60983,8 +60364,7 @@ /area/ai_monitored/storage/eva) "cES" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -60993,7 +60373,7 @@ /area/hallway/primary/central) "cET" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61002,7 +60382,7 @@ /area/hallway/primary/central) "cEU" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61028,7 +60408,7 @@ /area/hallway/primary/central) "cEY" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -61037,8 +60417,7 @@ /area/hallway/primary/central) "cEZ" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway South" @@ -61132,7 +60511,7 @@ dir = 8; icon_state = "arrival" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFm" = ( /obj/structure/cable{ d1 = 1; @@ -61143,7 +60522,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFn" = ( /obj/structure/cable{ d1 = 4; @@ -61156,15 +60535,19 @@ dir = 1; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFo" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61191,18 +60574,13 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFr" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/sign/barber{ pixel_x = 4; pixel_y = 32 @@ -61211,7 +60589,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFs" = ( /obj/structure/cable{ d1 = 4; @@ -61229,7 +60607,7 @@ dir = 1; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFu" = ( /obj/structure/cable{ d1 = 4; @@ -61247,7 +60625,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFv" = ( /obj/structure/cable{ d1 = 4; @@ -61258,7 +60636,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFw" = ( /obj/structure/cable{ d1 = 4; @@ -61269,7 +60647,7 @@ name = "Cabin" }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFx" = ( /obj/structure/cable{ d1 = 4; @@ -61329,8 +60707,7 @@ "cFC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61392,7 +60769,6 @@ dir = 8 }, /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/machinery/camera{ @@ -61418,8 +60794,13 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_4) +/obj/machinery/atmospherics/unary/outlet_injector/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "vault" + }, +/area/security/execution) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61428,17 +60809,25 @@ }, /area/maintenance/port) "cFP" = ( -/obj/docking_port/mobile/pod{ - dir = 4; - id = "pod4"; - name = "escape pod 4" +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Prison Gate"; + name = "Prison Lockdown Blast Doors"; + opacity = 0 }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_4) +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/security/permabrig) "cFR" = ( /obj/structure/grille{ density = 0; @@ -61939,14 +61328,16 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/item/radio/intercom{ - pixel_y = 25 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "red" }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_4) +/area/security/prisonershuttle) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -61955,8 +61346,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -62056,8 +61446,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "90Curve" + icon_state = "1-4" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable{ @@ -62081,12 +61470,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/sortjunction{ dir = 1; @@ -62101,8 +61488,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 @@ -62128,8 +61514,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{ @@ -62213,13 +61598,13 @@ dir = 8; icon_state = "arrival" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGQ" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -62231,7 +61616,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -62243,37 +61628,19 @@ dir = 4; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGT" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) -"cGV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -62284,7 +61651,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGX" = ( /obj/machinery/light/small{ dir = 8 @@ -62348,16 +61715,14 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/megaphone, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkbluefull" }, -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_4) +/area/bridge) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -62706,26 +62071,25 @@ /area/maintenance/starboard) "cIa" = ( /turf/simulated/wall/rust, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIb" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "arrival" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIc" = ( /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cId" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -62734,24 +62098,19 @@ dir = 8; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIh" = ( /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIi" = ( -/obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, /obj/machinery/camera{ c_tag = "Dorm Hallway Port"; dir = 1 @@ -62760,29 +62119,32 @@ dir = 8; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIj" = ( +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIk" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIl" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIm" = ( /obj/machinery/door/airlock/glass{ name = "Cabin" }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -62840,8 +62202,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -62858,9 +62219,17 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/effect/spawner/window/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/pod_4) +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" + }, +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -63183,7 +62552,7 @@ "cJs" = ( /obj/structure/closet/secure_closet/medical3, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -63191,8 +62560,7 @@ /area/medical/medbay2) "cJt" = ( /obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 + pixel_y = 28 }, /obj/structure/closet/secure_closet/medical3, /turf/simulated/floor/plasteel{ @@ -63201,7 +62569,7 @@ /area/medical/medbay2) "cJu" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ @@ -63227,8 +62595,7 @@ /area/maintenance/starboard) "cJx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -63238,7 +62605,7 @@ name = "Cabin" }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cJz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -63291,8 +62658,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -63335,10 +62701,9 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/blood/gibs, /turf/simulated/floor/plating, -/area/hallway/secondary/entry) +/area/maintenance/starboard) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -63425,7 +62790,7 @@ /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/maintenance/electrical) @@ -63602,7 +62967,6 @@ }, /area/hallway/primary/aft) "cKA" = ( -/obj/item/paicard, /obj/structure/chair/sofa/corp/right, /obj/effect/landmark/start{ name = "Civilian" @@ -63614,8 +62978,7 @@ /area/medical/research) "cKB" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/chair/sofa/corp, /turf/simulated/floor/plasteel{ @@ -63778,7 +63141,6 @@ "cKX" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/storage/firstaid/regular, @@ -63833,6 +63195,10 @@ pixel_x = -5; pixel_y = -5 }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -63976,25 +63342,25 @@ "cLo" = ( /obj/structure/dresser, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cLp" = ( /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cLq" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cLr" = ( /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/machinery/cryopod, @@ -64067,7 +63433,7 @@ "cLz" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall, -/area/maintenance/port) +/area/maintenance/abandonedbar) "cLA" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -64143,8 +63509,7 @@ /area/maintenance/electrical) "cLL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -64292,12 +63657,10 @@ /area/toxins/misc_lab) "cMb" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -64353,12 +63716,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/junction{ dir = 4; @@ -64472,6 +63833,9 @@ "cMv" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64569,22 +63933,22 @@ /obj/structure/bed, /obj/item/bedsheet/red, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cMN" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/cane, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cMO" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cMP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -64709,8 +64073,7 @@ /area/toxins/xenobiology) "cNj" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/cleanable/blood/xeno, /turf/simulated/floor/plasteel{ @@ -64731,8 +64094,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 26; - pixel_y = 32 + pixel_x = 25; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk{ @@ -64901,7 +64264,6 @@ /obj/machinery/door/airlock/research/glass{ autoclose = 0; frequency = null; - icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Xenobiology Kill Room"; @@ -64955,9 +64317,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/railing{ dir = 4 }, @@ -65163,8 +64523,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/junction{ dir = 1; @@ -65268,45 +64627,22 @@ "cOc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28; - pixel_y = 30 + pixel_x = 25; + pixel_y = 28 }, /turf/simulated/floor/wood, /area/medical/psych) "cOd" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box/masks, -/obj/item/storage/box/beakers, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cOe" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 - }, -/obj/structure/closet/secure_closet/medical1, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay) +/obj/item/reagent_containers/food/snacks/badrecipe, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cOg" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -65416,20 +64752,20 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cOq" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cOr" = ( /obj/structure/table/wood, /obj/item/folder/red, /obj/item/pen, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cOs" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -65572,17 +64908,14 @@ "cOL" = ( /obj/structure/table, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/item/paper_bin, /obj/item/pen, /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -65604,8 +64937,7 @@ /area/maintenance/port) "cON" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -65649,8 +64981,8 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26; - pixel_y = 32 + pixel_x = -25; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -65674,8 +65006,8 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26; - pixel_y = 32 + pixel_x = -25; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -65705,17 +65037,14 @@ /turf/simulated/wall, /area/toxins/xenobiology) "cPa" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 22 +/obj/effect/mob_spawn/human/corpse/charredskeleton, +/obj/effect/rune{ + cultist_desc = "an imitation of the real thing with no power."; + desc = "An odd collection of symbols drawn in what seems to be very old and dry blood."; + name = "old smeared rune" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/toxins/xenobiology) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cPb" = ( /obj/structure/table/reinforced, /obj/item/storage/box/beakers, @@ -66053,11 +65382,20 @@ /turf/space, /area/space/nearstation) "cPY" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" +/obj/machinery/door/airlock/glass{ + name = "Cabin" }, -/area/space/nearstation) +/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{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -66107,7 +65445,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plating, /area/medical/medbay3) @@ -66129,21 +65467,21 @@ /obj/machinery/light, /obj/item/paicard, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cQf" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/maid, /obj/item/clothing/suit/browntrenchcoat, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cQg" = ( /obj/structure/dresser, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cQh" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cQi" = ( /obj/structure/bed, /obj/machinery/status_display{ @@ -66152,7 +65490,7 @@ /obj/machinery/light, /obj/item/bedsheet/yellow, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cQj" = ( /obj/machinery/light, /obj/machinery/camera{ @@ -66234,9 +65572,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cQs" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/item/reagent_containers/food/snacks/candy/candybar, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -66245,12 +65583,9 @@ }, /area/maintenance/port) "cQv" = ( -/obj/structure/sign/pods{ - pixel_x = -32 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/effect/decal/cleanable/blood/footprints, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -66394,7 +65729,7 @@ /obj/item/reagent_containers/dropper, /obj/effect/decal/warning_stripes/north, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) @@ -66461,8 +65796,7 @@ "cQO" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66578,8 +65912,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/item/radio/intercom{ pixel_y = 28 @@ -66662,8 +65995,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 @@ -66683,7 +66015,6 @@ /area/medical/psych) "cRr" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, @@ -67300,8 +66631,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 @@ -67348,8 +66678,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 @@ -67522,9 +66851,14 @@ }, /area/crew_quarters/fitness) "cTg" = ( -/obj/effect/spawner/window/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/pod_2) +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -67786,12 +67120,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/hologram/holopad, @@ -67878,6 +67210,7 @@ /area/toxins/misc_lab) "cTL" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/machinery/camera{ @@ -67966,7 +67299,7 @@ /area/hallway/primary/aft) "cTW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -68095,28 +67428,34 @@ /turf/simulated/floor/carpet, /area/medical/psych) "cUj" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 5; + pixel_y = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/item/storage/box/masks, +/obj/item/storage/box/beakers, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"cUk" = ( +/obj/item/radio/intercom{ + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, -/area/medical/medbay) -"cUk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) +/area/medical/medbay3) "cUl" = ( /obj/structure/table/wood, /obj/machinery/kitchen_machine/microwave, @@ -68184,9 +67523,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 30 - }, /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ dir = 1; @@ -68205,12 +67541,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -68452,8 +67786,11 @@ }, /area/crew_quarters/fitness) "cUP" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/pod_2) +"cUQ" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -68464,16 +67801,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) -"cUQ" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_2) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -68640,8 +67967,7 @@ "cVl" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -1 + pixel_x = 26 }, /obj/machinery/chem_master, /turf/simulated/floor/engine, @@ -68649,6 +67975,7 @@ "cVm" = ( /obj/machinery/smartfridge/secure/extract, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -68708,8 +68035,7 @@ pixel_y = 32 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68749,7 +68075,7 @@ /obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -68793,7 +68119,7 @@ pixel_y = -3 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -68929,8 +68255,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -68954,7 +68279,7 @@ /area/medical/medbay3) "cVW" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68977,8 +68302,7 @@ "cWb" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/disposalpipe/junction{ dir = 4 @@ -69467,9 +68791,7 @@ /obj/item/clothing/gloves/color/latex, /obj/item/slime_scanner, /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -69478,9 +68800,7 @@ /area/toxins/xenobiology) "cXb" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/emcloset, @@ -69565,21 +68885,14 @@ }, /area/medical/chemistry) "cXl" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + dir = 1; + icon_state = "whiteblue" }, /area/medical/medbay3) "cXm" = ( /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/computer/crew{ @@ -69620,14 +68933,10 @@ }, /area/medical/medbay) "cXq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/structure/closet/secure_closet/medical1, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whiteblue" }, /area/medical/medbay3) "cXr" = ( @@ -69652,8 +68961,8 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69667,15 +68976,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/hologram/holopad{ - pixel_y = -16 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69707,6 +69008,12 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/table, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -69945,7 +69252,6 @@ "cYm" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/item/stack/cable_coil/random, @@ -69970,7 +69276,7 @@ /area/toxins/lab) "cYo" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -32 + pixel_y = -28 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -70139,8 +69445,7 @@ /area/medical/psych) "cYR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/status_display{ pixel_y = 32 @@ -70169,13 +69474,19 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cYW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -70217,7 +69528,7 @@ "cZa" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/machinery/camera{ c_tag = "Medbay Break Room"; @@ -70338,14 +69649,14 @@ }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/maintenance/abandonedbar) "cZl" = ( /obj/machinery/door/airlock/maintenance{ name = "Gambling Den" }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/port) +/area/maintenance/abandonedbar) "cZm" = ( /obj/machinery/light/small{ dir = 1 @@ -70360,10 +69671,10 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cZp" = ( -/obj/machinery/sleeper{ - dir = 4 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -70460,9 +69771,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/hologram/holopad{ - pixel_x = -16 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70571,7 +69880,7 @@ /area/medical/medbay) "cZJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -70584,29 +69893,31 @@ }, /area/medical/medbay) "cZM" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" +/obj/machinery/light{ + dir = 8 }, -/area/medical/medbay) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "cZN" = ( -/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/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/medbay) +/area/medical/medbay3) "cZO" = ( /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 = "whiteblue" }, @@ -70651,8 +69962,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -70697,10 +70007,11 @@ }, /area/medical/surgery) "daa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" + icon_state = "white" }, /area/medical/medbay3) "dab" = ( @@ -70727,18 +70038,18 @@ /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "daf" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dag" = ( /obj/structure/table/wood, /obj/machinery/cell_charger, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dah" = ( /obj/structure/cable{ d2 = 2; @@ -70753,7 +70064,7 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dai" = ( /obj/structure/table/wood, /obj/item/stack/rods{ @@ -70762,14 +70073,13 @@ /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/sign/barsign{ pixel_y = 32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "daj" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -70777,7 +70087,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dak" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -70797,7 +70107,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dam" = ( /obj/machinery/door/window/westleft{ name = "Robotics Desk"; @@ -70812,7 +70122,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dap" = ( /obj/structure/cable{ d1 = 4; @@ -70928,8 +70238,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -70943,14 +70252,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, @@ -70975,14 +70282,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; @@ -71006,8 +70311,7 @@ /area/medical/research) "daF" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -71139,8 +70443,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -71259,12 +70562,14 @@ }, /area/toxins/mixing) "dbi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/area/medical/medbay) +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/medbay3) "dbj" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -71332,8 +70637,12 @@ /turf/simulated/wall, /area/medical/surgery) "dbs" = ( -/obj/structure/sign/examroom, -/turf/simulated/wall, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, /area/medical/medbay3) "dbt" = ( /obj/structure/cable{ @@ -71343,6 +70652,8 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -71383,13 +70694,13 @@ "dbz" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbA" = ( /obj/item/hemostat, /obj/effect/decal/cleanable/dirt, /obj/structure/table/tray, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plating, /area/medical/surgery) @@ -71432,7 +70743,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbE" = ( /obj/structure/cable{ d1 = 4; @@ -71442,7 +70753,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -71462,18 +70773,18 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbH" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -71496,7 +70807,7 @@ pixel_x = 32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbK" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -71742,8 +71053,7 @@ "dcj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -71887,14 +71197,13 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -71911,12 +71220,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72007,13 +71312,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -72085,34 +71388,28 @@ "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{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcN" = ( /obj/structure/cable{ d1 = 1; @@ -72133,7 +71430,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcQ" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -72146,7 +71443,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -72162,7 +71459,7 @@ "dcT" = ( /obj/structure/chair/wood, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcU" = ( /obj/structure/cable{ d1 = 1; @@ -72171,7 +71468,7 @@ }, /obj/structure/table/wood/poker, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -72187,12 +71484,12 @@ pixel_x = -1 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcX" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcY" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plating, @@ -72265,7 +71562,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/cell_charger, /obj/machinery/light, @@ -72326,8 +71623,7 @@ "ddp" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -72399,7 +71695,6 @@ }, /area/maintenance/apmaint) "ddw" = ( -/obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -72474,7 +71769,7 @@ "ddF" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/item/folder/white, /obj/item/reagent_containers/glass/beaker/large, @@ -72611,9 +71906,7 @@ icon_state = "1-4" }, /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/structure/closet/secure_closet/chemical, /obj/structure/cable{ @@ -72632,8 +71925,8 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ - pixel_x = 4; - pixel_y = -22 + dir = 1; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -72684,7 +71977,7 @@ /obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -72725,8 +72018,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -72736,7 +72028,7 @@ "ddZ" = ( /obj/machinery/chem_master, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/structure/sign/nosmoking_2{ pixel_x = -32; @@ -72756,6 +72048,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -72803,8 +72097,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72906,9 +72199,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{ @@ -72917,16 +72208,12 @@ /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, @@ -72957,7 +72244,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deB" = ( /obj/structure/cable{ d1 = 1; @@ -72972,7 +72259,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deC" = ( /obj/structure/cable{ d1 = 4; @@ -72992,7 +72279,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deD" = ( /obj/structure/cable{ d1 = 4; @@ -73009,7 +72296,7 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deE" = ( /obj/structure/cable{ d1 = 1; @@ -73031,7 +72318,7 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deF" = ( /obj/structure/cable{ d1 = 1; @@ -73053,7 +72340,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deH" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -73145,7 +72432,7 @@ /obj/item/clothing/mask/gas, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -73185,16 +72472,9 @@ }, /area/library/abandoned) "deV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitegreen" - }, -/area/medical/virology) +/obj/structure/sign/examroom, +/turf/simulated/wall, +/area/medical/medbay3) "deW" = ( /obj/structure/cable{ d1 = 1; @@ -73239,8 +72519,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -73344,7 +72623,7 @@ /area/crew_quarters/hor) "dfm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -73454,7 +72733,7 @@ }, /obj/machinery/iv_drip, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -73561,13 +72840,13 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfN" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfO" = ( /obj/structure/cable{ d1 = 1; @@ -73580,7 +72859,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfP" = ( /obj/structure/chair/wood{ dir = 8 @@ -73589,7 +72868,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfQ" = ( /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -73620,7 +72899,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfV" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -73690,8 +72969,7 @@ /area/toxins/explab) "dgh" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/closet/bombcloset, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -73723,7 +73001,7 @@ "dgk" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -73782,7 +73060,7 @@ /obj/machinery/firealarm{ dir = 8; pixel_x = -26; - pixel_y = 28 + pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -73819,11 +73097,12 @@ pixel_x = -24 }, /obj/structure/table/reinforced, -/obj/item/paicard, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73849,7 +73128,7 @@ /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -73955,7 +73234,7 @@ pixel_x = 24 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -73976,8 +73255,7 @@ /area/medical/genetics_cloning) "dgJ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -74151,7 +73429,7 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74294,19 +73572,19 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dhv" = ( /obj/structure/table/wood/poker, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dhw" = ( /obj/structure/chair/wood{ dir = 4 }, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dhx" = ( /obj/effect/landmark{ name = "blobstart" @@ -74321,7 +73599,6 @@ /obj/item/stack/cable_coil/random, /obj/item/stock_parts/scanning_module, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -74381,7 +73658,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dhD" = ( /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -74426,12 +73703,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -74515,8 +73790,7 @@ /area/toxins/explab) "dhN" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/displaycase/labcage, /obj/effect/decal/warning_stripes/yellow, @@ -74527,10 +73801,10 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "dhP" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/computer/message_monitor{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74674,8 +73948,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -74799,7 +74072,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/machinery/alarm{ @@ -74961,8 +74233,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 @@ -75082,7 +74353,7 @@ /area/medical/medbay) "diM" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -75193,7 +74464,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "diZ" = ( /obj/effect/decal/cleanable/vomit, /obj/effect/landmark{ @@ -75202,13 +74473,13 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dja" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "djb" = ( /obj/structure/table/reinforced, /obj/item/folder/white, @@ -75269,8 +74540,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -75502,6 +74772,7 @@ pixel_x = -24 }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -75531,8 +74802,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = null + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -75651,12 +74921,10 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/disposalpipe/sortjunction{ dir = 2; @@ -75714,12 +74982,10 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/aft) @@ -75764,8 +75030,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -75832,8 +75097,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/sortjunction{ @@ -75896,7 +75160,7 @@ "dkm" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /obj/item/stack/packageWrap, /obj/item/stack/sheet/metal{ @@ -75929,8 +75193,7 @@ /area/medical/research) "dkq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75941,7 +75204,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dks" = ( /obj/effect/landmark{ name = "revenantspawn" @@ -75949,7 +75212,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dkt" = ( /obj/structure/cable{ d1 = 1; @@ -75963,7 +75226,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dku" = ( /turf/simulated/wall/rust, /area/maintenance/apmaint) @@ -75975,7 +75238,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dkw" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ @@ -76157,12 +75420,10 @@ }, /obj/structure/chair/office/light, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76223,12 +75484,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -76264,8 +75523,8 @@ req_access_txt = "66" }, /obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = -6 + dir = 4; + pixel_x = -26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -76328,7 +75587,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -76377,7 +75635,7 @@ "dlm" = ( /obj/machinery/light, /obj/machinery/camera{ - c_tag = "Medbay Psych Office Corridor East"; + c_tag = "Medbay Cloning"; dir = 1 }, /obj/machinery/bodyscanner, @@ -76390,8 +75648,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76508,8 +75765,7 @@ /area/crew_quarters/fitness) "dlD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -76560,7 +75816,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dlJ" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -76568,7 +75824,7 @@ "dlK" = ( /obj/structure/table/wood, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dlL" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, @@ -76615,8 +75871,7 @@ /area/toxins/mixing) "dlT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -76723,6 +75978,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/paicard, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76750,7 +76006,6 @@ /area/assembly/chargebay) "dmh" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -76859,8 +76114,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76899,8 +76153,7 @@ "dmC" = ( /obj/machinery/vending/medical, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -76944,8 +76197,7 @@ /area/hallway/secondary/construction) "dmJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -76966,7 +76218,7 @@ "dmM" = ( /obj/structure/chair/wood, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmN" = ( /obj/structure/cable{ d1 = 1; @@ -76983,13 +76235,12 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmO" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -76998,7 +76249,7 @@ /obj/structure/grille, /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmP" = ( /obj/structure/cable, /obj/structure/cable{ @@ -77016,16 +76267,17 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmQ" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/chair/stool{ + dir = 8 }, -/area/maintenance/gambling_den) +/turf/simulated/floor/wood, +/area/maintenance/abandonedbar) "dmR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -77169,8 +76421,7 @@ "dnj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -77363,7 +76614,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dnI" = ( /obj/effect/decal/warning_stripes/blue, /obj/machinery/door/poddoor/shutters{ @@ -77394,7 +76645,6 @@ "dnL" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/item/storage/box/disks{ @@ -77422,8 +76672,7 @@ /area/medical/genetics) "dnN" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/computer/scan_consolenew, @@ -77470,7 +76719,7 @@ "dnU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77528,12 +76777,10 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -77542,7 +76789,7 @@ "doa" = ( /obj/machinery/dna_scannernew, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -77603,8 +76850,7 @@ /area/medical/surgeryobs) "doi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -77627,8 +76873,7 @@ "dok" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -1 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77644,6 +76889,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -77718,7 +76968,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dov" = ( /obj/structure/computerframe, /obj/effect/decal/warning_stripes/southwest, @@ -77738,8 +76988,8 @@ /area/medical/research) "doy" = ( /obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = 24 + pixel_x = -26; + pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -77764,8 +77014,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -77825,12 +77074,6 @@ }, /area/medical/genetics_cloning) "doI" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -77902,6 +77145,10 @@ }, /area/crew_quarters/hor) "doN" = ( +/obj/machinery/keycard_auth{ + pixel_x = 38; + pixel_y = -24 + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -77912,7 +77159,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -78012,8 +77259,9 @@ /area/hallway/primary/aft) "dpb" = ( /obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -22 + dir = 1; + pixel_x = 26; + pixel_y = -26 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -78067,7 +77315,7 @@ /obj/structure/closet/paramedic, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -78145,12 +77393,10 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/sortjunction{ dir = 1; @@ -78359,6 +77605,7 @@ 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/structure/cable, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -78390,7 +77637,7 @@ "dpK" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -78449,7 +77696,6 @@ /obj/structure/table/reinforced, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -78458,7 +77704,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -78470,7 +77716,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dpS" = ( /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, @@ -78574,7 +77820,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/west, @@ -78600,7 +77846,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -78611,7 +77857,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -78962,45 +78208,44 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dra" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "drb" = ( /obj/structure/table/wood/poker, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "drc" = ( /obj/structure/table/wood/poker, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "drd" = ( /obj/structure/table/wood/poker, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/turf/simulated/floor/wood, +/area/maintenance/abandonedbar) "dre" = ( /obj/structure/table/wood/poker, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "drf" = ( /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "drg" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -79070,6 +78315,7 @@ /area/maintenance/port) "drp" = ( /obj/machinery/button/windowtint{ + dir = 1; pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, @@ -79216,8 +78462,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -4 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -79464,7 +78709,6 @@ /area/medical/cmo) "dsi" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -79499,8 +78743,7 @@ /area/hallway/secondary/construction) "dsm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -79575,8 +78818,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79680,7 +78922,7 @@ "dsJ" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/requests_console{ department = "Robotics"; @@ -79730,8 +78972,7 @@ "dsM" = ( /obj/structure/rack, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/item/book/manual/robotics_cyborgs, /obj/item/book/manual/ripley_build_and_repair, @@ -79781,9 +79022,7 @@ /area/medical/genetics) "dsQ" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -79859,7 +79098,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -79869,7 +79108,7 @@ "dsZ" = ( /obj/machinery/dna_scannernew, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -80162,8 +79401,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 @@ -80188,30 +79426,22 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/construction) "dtF" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" }, -/obj/item/radio/intercom{ - pixel_y = 28 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/medical/medbay) "dtG" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/camera{ + c_tag = "Medbay East Hallway"; + dir = 4; + network = list("Medical","SS13") }, -/obj/machinery/power/smes, -/obj/machinery/light/small{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitebluecorner" }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/medical/medbay) "dtH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -80230,13 +79460,11 @@ pixel_y = -32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dtK" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/turf/simulated/floor/wood, +/area/maintenance/abandonedbar) "dtL" = ( /obj/machinery/light/small, /obj/structure/sign/poster/contraband/random{ @@ -80244,14 +79472,13 @@ }, /obj/machinery/vending/boozeomat, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dtM" = ( /obj/structure/table, /obj/item/wrench, /obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plating, @@ -80312,8 +79539,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, @@ -80325,7 +79551,7 @@ /obj/effect/decal/warning_stripes/yellow, /obj/structure/closet/secure_closet/scientist, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -80350,7 +79576,7 @@ icon_state = "1-4" }, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80370,12 +79596,11 @@ "dub" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -80403,8 +79628,8 @@ pixel_y = 24 }, /obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 34 + pixel_x = 26; + pixel_y = 26 }, /obj/item/flash, /obj/item/flash, @@ -80449,8 +79674,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 4 + pixel_x = -26 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -80537,12 +79761,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -80579,16 +79801,9 @@ }, /area/medical/cmo) "duw" = ( -/obj/machinery/camera{ - c_tag = "Mini Satellite Access"; - dir = 4; - network = list("SS13","MiniSat") - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/obj/effect/spawner/window/reinforced/polarized, +/turf/simulated/floor/plating, +/area/chapel/main) "dux" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -80634,8 +79849,7 @@ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 27; - pixel_y = 5 + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -80679,8 +79893,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -80724,8 +79937,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80733,20 +79945,16 @@ }, /area/maintenance/starboard) "duO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/camera{ + c_tag = "Virology south"; + dir = 4; + network = list("Medical","SS13") }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreencorner" }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/medical/virology) "duP" = ( /obj/machinery/camera{ c_tag = "Engine Room South"; @@ -80787,7 +79995,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "duU" = ( /obj/structure/computerframe, /turf/simulated/floor/plating, @@ -80907,7 +80115,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -81030,8 +80237,7 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -4; - pixel_y = 27 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -81110,7 +80316,7 @@ department = "Chief Medical Officer's Office" }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -81137,12 +80343,13 @@ /area/medical/cmo) "dvI" = ( /obj/machinery/light_switch{ + dir = 1; pixel_x = 26; pixel_y = -26 }, /obj/machinery/keycard_auth{ pixel_x = 38; - pixel_y = -26 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81182,8 +80389,8 @@ /area/medical/surgery1) "dvL" = ( /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = -5 + dir = 4; + pixel_x = -26 }, /obj/machinery/holosign_switch{ id = "surgery1"; @@ -81376,8 +80583,7 @@ "dwh" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -81456,8 +80662,8 @@ /obj/item/flash, /obj/item/flash, /obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = 22 + pixel_x = -26; + pixel_y = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/item/robotanalyzer, @@ -81483,12 +80689,10 @@ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81641,7 +80845,6 @@ /obj/item/stack/medical/bruise_pack/advanced, /obj/item/reagent_containers/iv_bag/salglu, /obj/machinery/status_display{ - layer = 4; pixel_y = -32 }, /obj/machinery/camera{ @@ -81723,7 +80926,7 @@ /area/crew_quarters/theatre) "dwT" = ( /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) @@ -81781,8 +80984,8 @@ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = -26; - pixel_y = 26 + pixel_x = -28; + pixel_y = 28 }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ @@ -81824,8 +81027,7 @@ "dxf" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -81840,7 +81042,7 @@ }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81918,7 +81120,6 @@ "dxo" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -81930,8 +81131,7 @@ /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -82157,10 +81357,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - id_tag = null; +/obj/machinery/door/airlock{ name = "Morgue"; - opacity = 1; req_access_txt = "6" }, /turf/simulated/floor/plasteel{ @@ -82343,13 +81541,11 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -82413,12 +81609,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -82498,11 +81692,10 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/status_display{ - pixel_x = -31 + pixel_x = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -82514,7 +81707,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -82522,13 +81715,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, @@ -82578,8 +81768,8 @@ dir = 9 }, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 + dir = 8; + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -82806,24 +81996,19 @@ }, /area/assembly/robotics) "dyT" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8"; - tag = "" +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "chapel" }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) +/area/chapel/main) "dyU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -82972,6 +82157,7 @@ /area/medical/medbay) "dzq" = ( /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /turf/simulated/floor/wood, @@ -83119,6 +82305,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -83127,8 +82314,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -83140,8 +82326,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -32; - pixel_y = -32 + pixel_x = -25; + pixel_y = -28 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ @@ -83228,7 +82414,7 @@ /area/toxins/storage) "dzL" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -83346,7 +82532,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/item/cartridge/signal/toxins{ pixel_x = -6 @@ -83370,8 +82556,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = null + icon_state = "1-4" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -83436,7 +82621,7 @@ name = "Robotics Operating Computer" }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83554,10 +82739,8 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - id_tag = null; +/obj/machinery/door/airlock{ name = "Morgue"; - opacity = 1; req_access_txt = "6" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -83576,7 +82759,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -83615,12 +82798,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -83681,8 +82862,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -83810,7 +82990,7 @@ "dAM" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -83852,7 +83032,7 @@ "dAS" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/head/hardhat/red, @@ -83927,9 +83107,7 @@ /area/toxins/test_area) "dBa" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/structure/closet/secure_closet/scientist, /obj/effect/decal/warning_stripes/yellow, @@ -84027,7 +83205,7 @@ "dBj" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/cable{ d1 = 1; @@ -84060,13 +83238,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ +/obj/machinery/door/airlock/medical{ name = "Virology Lobby"; req_access_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/medbay) "dBp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -84245,8 +83425,7 @@ /area/hallway/primary/aft) "dBR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -84254,10 +83433,8 @@ /area/hallway/primary/aft) "dBS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - id_tag = null; +/obj/machinery/door/airlock{ name = "Morgue"; - opacity = 1; req_access_txt = "6" }, /obj/structure/disposalpipe/segment{ @@ -84437,11 +83614,10 @@ "dCn" = ( /obj/machinery/bodyscanner, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/status_display{ - pixel_x = 31 + pixel_x = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -84483,7 +83659,7 @@ /obj/item/surgicaldrill, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -84639,7 +83815,7 @@ pixel_x = -1 }, /obj/structure/urinal{ - pixel_y = 27 + pixel_y = 28 }, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) @@ -84736,7 +83912,7 @@ /obj/item/clothing/head/welding, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -85545,7 +84721,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -85616,7 +84791,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -85632,9 +84807,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, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -85841,8 +85017,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -86011,9 +85186,7 @@ /area/hallway/primary/aft) "dGn" = ( /obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = -29 + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/secure_closet/roboticist, @@ -86054,14 +85227,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 @@ -86092,8 +85263,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{ @@ -86128,7 +85298,7 @@ /obj/item/paper_bin, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86147,8 +85317,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{ @@ -86322,6 +85491,7 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /turf/simulated/floor/plasteel{ @@ -86332,8 +85502,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -86354,21 +85523,11 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) -"dGZ" = ( -/obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) "dHa" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/access_button{ command = "cycle_interior"; @@ -86381,20 +85540,20 @@ /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; - icon_state = "door_locked"; id_tag = "viro_lab_airlock_interior"; locked = 1; name = "Virology Lab Internal Airlock"; req_access_txt = "39" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHb" = ( /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"; @@ -86405,7 +85564,9 @@ tag_exterior_door = "viro_lab_airlock_exterior"; tag_interior_door = "viro_lab_airlock_interior" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHc" = ( /obj/structure/cable{ @@ -86416,14 +85577,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 @@ -86431,7 +85590,9 @@ /obj/structure/sign/vacuum{ pixel_y = -32 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHd" = ( /obj/structure/cable{ @@ -86442,37 +85603,37 @@ /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{ + icon_state = "whitegreenfull" }, -/turf/simulated/floor/plasteel, /area/medical/virology) "dHe" = ( /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; name = "Virology"; req_access_txt = "39" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHf" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86483,14 +85644,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, @@ -86516,11 +85675,12 @@ }, /area/maintenance/port) "dHm" = ( -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera{ + c_tag = "Virology north"; + dir = 8; + network = list("Medical","SS13") + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -86531,18 +85691,18 @@ /obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkgreen" }, /area/medical/virology) "dHp" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/bed, /obj/item/bedsheet/medical, @@ -86556,7 +85716,6 @@ "dHq" = ( /obj/structure/table/glass, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -86565,7 +85724,8 @@ }, /obj/machinery/computer/med_data/laptop, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkgreen" }, /area/medical/virology) "dHr" = ( @@ -86732,8 +85892,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -86804,13 +85963,11 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -86922,7 +86079,7 @@ "dId" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86933,8 +86090,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -86942,12 +86098,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87009,8 +86163,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 @@ -87027,8 +86180,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"; @@ -87040,14 +86192,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/virology) "dIm" = ( /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 @@ -87057,7 +86210,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dIn" = ( @@ -87069,14 +86222,13 @@ /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 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, /area/medical/virology) "dIo" = ( @@ -87091,7 +86243,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dIp" = ( @@ -87256,13 +86408,11 @@ /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{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87272,8 +86422,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; @@ -87286,14 +86435,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/virology) "dJb" = ( /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 @@ -87308,8 +86458,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -87319,8 +86468,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 @@ -87336,8 +86484,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{ @@ -87366,20 +86513,19 @@ /area/medical/virology) "dJh" = ( /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = 4 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dJi" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87390,8 +86536,7 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dJk" = ( @@ -87545,7 +86690,7 @@ sortType = 17 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -87611,7 +86756,7 @@ /area/medical/surgery) "dJP" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -87622,8 +86767,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, @@ -87637,11 +86781,12 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJT" = ( @@ -87652,29 +86797,31 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJU" = ( /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{ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJV" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJW" = ( @@ -87684,15 +86831,15 @@ "dJX" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkgreen" }, /area/medical/virology) "dJY" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87701,7 +86848,8 @@ "dJZ" = ( /obj/machinery/vending/virodrobe, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkgreen" }, /area/medical/virology) "dKa" = ( @@ -87737,7 +86885,7 @@ "dKd" = ( /obj/structure/table, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87750,7 +86898,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -87773,8 +86921,7 @@ "dKg" = ( /obj/structure/bookcase, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87810,7 +86957,7 @@ "dKk" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87820,7 +86967,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/machinery/light_switch{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87861,10 +87008,6 @@ /area/hallway/secondary/exit) "dKr" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "Chapel"; - opacity = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87873,8 +87016,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; @@ -87976,9 +87118,8 @@ }, /area/chapel/office) "dKK" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/glass{ name = "Chapel Morgue"; - opacity = 1; req_access_txt = "27" }, /turf/simulated/floor/plasteel{ @@ -88004,13 +87145,13 @@ /area/chapel/main) "dKO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "Chapel"; - opacity = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + name = "Chapel" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -88044,12 +87185,10 @@ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -88072,8 +87211,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -88111,37 +87249,48 @@ "dLa" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/sink{ dir = 8; pixel_x = -12 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dLb" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dLc" = ( -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /obj/machinery/shower{ dir = 8 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dLd" = ( /obj/structure/sink{ @@ -88152,7 +87301,9 @@ pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dLe" = ( /turf/simulated/floor/plasteel{ @@ -88164,8 +87315,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -88178,13 +87328,8 @@ /area/medical/virology) "dLg" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -88278,7 +87423,6 @@ "dLp" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -88323,15 +87467,13 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -88522,8 +87664,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{ @@ -88553,8 +87694,7 @@ /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{ @@ -88565,8 +87705,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -88576,17 +87715,25 @@ "dLY" = ( /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/camera{ + c_tag = "Virology decontamination"; + dir = 4; + network = list("Medical","SS13") + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dMa" = ( /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ - pixel_x = 4; - pixel_y = -32 + pixel_y = -28 }, /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dMc" = ( /obj/machinery/alarm{ @@ -88672,8 +87819,7 @@ /area/hallway/secondary/exit) "dMp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -88709,14 +87855,15 @@ "dMv" = ( /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dMw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88726,8 +87873,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, @@ -88740,8 +87886,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88756,8 +87901,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88767,8 +87911,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88782,8 +87925,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88816,14 +87958,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; @@ -88852,8 +87992,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 @@ -88874,8 +88013,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -88883,12 +88021,10 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -88898,8 +88034,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, @@ -89021,9 +88156,9 @@ /area/chapel/main) "dMX" = ( /obj/structure/chair/wood, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 28 +/obj/machinery/button/windowtint{ + dir = 8; + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -89092,8 +88227,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, @@ -89125,8 +88259,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -89172,8 +88305,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, @@ -89196,7 +88328,6 @@ pixel_y = 24 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -89278,7 +88409,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89354,8 +88485,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -89373,8 +88503,7 @@ /area/medical/virology) "dNY" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/power/apc{ @@ -89426,16 +88555,13 @@ /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; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -89445,8 +88571,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 @@ -89463,8 +88588,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical{ name = "Virology"; @@ -89482,14 +88606,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 @@ -89506,8 +88628,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 @@ -89523,8 +88644,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -89545,12 +88665,10 @@ /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; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -89563,14 +88681,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, @@ -89614,9 +88730,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/glass{ name = "Chapel Morgue"; - opacity = 1; req_access_txt = "27" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -89646,7 +88761,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -89700,7 +88815,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "dOE" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -89708,17 +88822,16 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "90Curve" + icon_state = "1-4" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/virology) "dOF" = ( /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -89742,8 +88855,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, @@ -89755,8 +88867,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/sink{ dir = 8; @@ -89779,7 +88890,7 @@ /obj/machinery/iv_drip, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" @@ -89797,21 +88908,16 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/paper_bin, -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /obj/item/storage/box/monkeycubes, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -89943,16 +89049,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table, /obj/item/crowbar, /obj/item/wrench, /obj/item/restraints/handcuffs/cable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -90009,8 +89113,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{ @@ -90022,8 +89125,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, @@ -90032,8 +89134,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -90051,14 +89152,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 = 5 @@ -90089,8 +89188,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 @@ -90107,8 +89205,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{ @@ -90126,18 +89223,15 @@ /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; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -90148,14 +89242,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{ @@ -90173,8 +89265,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 @@ -90205,7 +89296,6 @@ /area/maintenance/apmaint) "dPD" = ( /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -90219,15 +89309,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/crema_switch{ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -90394,8 +89482,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{ @@ -90421,8 +89508,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 4 @@ -90543,8 +89629,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -90555,8 +89640,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{ @@ -90669,16 +89753,14 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/medical/virology) "dQI" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -90699,8 +89781,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -90716,8 +89797,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; @@ -90761,8 +89841,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -90779,8 +89858,7 @@ "dQP" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -90788,14 +89866,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 @@ -90817,8 +89893,8 @@ /obj/item/clipboard, /obj/item/folder/yellow, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 + dir = 8; + pixel_x = 26 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -90840,13 +89916,11 @@ /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{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -90857,7 +89931,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -90900,8 +89974,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -90914,8 +89987,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"; @@ -90941,8 +90013,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, @@ -90973,8 +90044,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ @@ -90990,8 +90060,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, @@ -91062,7 +90131,7 @@ /obj/item/clothing/mask/breath, /obj/item/reagent_containers/food/drinks/coffee, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91072,7 +90141,7 @@ /obj/structure/morgue, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91130,8 +90199,9 @@ "dRA" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -24 + dir = 1; + pixel_x = 26; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91146,8 +90216,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, @@ -91175,8 +90244,7 @@ "dRG" = ( /obj/structure/chair, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -91219,8 +90287,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/morgue{ name = "Chapel Morgue"; @@ -91246,9 +90313,8 @@ /area/chapel/main) "dRP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/glass{ name = "Chapel Office"; - opacity = 1; req_access_txt = "27" }, /turf/simulated/floor/plasteel{ @@ -91303,8 +90369,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, @@ -91316,8 +90381,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, @@ -91337,8 +90401,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, @@ -91352,7 +90415,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91364,7 +90427,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91386,8 +90449,7 @@ /area/chapel/office) "dSj" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -91404,8 +90466,8 @@ /area/chapel/office) "dSm" = ( /obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 24 + pixel_x = 26; + pixel_y = 26 }, /obj/machinery/firealarm{ pixel_y = 26 @@ -91450,9 +90512,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "dSr" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/glass{ name = "Chapel Office"; - opacity = 1; req_access_txt = "27" }, /turf/simulated/floor/plasteel{ @@ -91536,8 +90597,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, @@ -91546,14 +90606,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, @@ -91562,8 +90620,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, @@ -91573,13 +90630,12 @@ /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) "dSJ" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -91609,8 +90665,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, @@ -91671,8 +90726,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, @@ -91681,8 +90735,7 @@ /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) @@ -91729,14 +90782,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, @@ -91786,7 +90837,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -91804,8 +90854,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -91817,8 +90866,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -91842,7 +90890,7 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/status_display{ pixel_y = 32 @@ -91861,8 +90909,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -4 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91896,8 +90944,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 @@ -91922,8 +90969,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -91937,12 +90983,13 @@ /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; - icon_state = "door_locked"; id_tag = "viro_lab_airlock_exterior"; locked = 1; name = "Virology Lab External Airlock"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91970,14 +91017,12 @@ /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/hallway/secondary/exit) @@ -92092,9 +91137,8 @@ }, /area/chapel/office) "dUd" = ( -/obj/machinery/door/airlock/centcom{ +/obj/machinery/door/airlock/glass{ name = "Chapel Office"; - opacity = 1; req_access_txt = "27" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -92143,8 +91187,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, @@ -92174,8 +91217,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, @@ -92296,14 +91338,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; @@ -92375,7 +91415,7 @@ /area/engine/engineering) "dUJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/dresser, /turf/simulated/floor/plasteel{ @@ -92418,8 +91458,8 @@ pixel_y = -24 }, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 + dir = 8; + pixel_x = 26 }, /obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/plasteel{ @@ -92431,8 +91471,8 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/chaplain, /obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 + dir = 8; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -92457,7 +91497,7 @@ }, /obj/item/storage/fancy/candle_box/full, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/carpet, /area/chapel/office) @@ -92550,8 +91590,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, @@ -92576,8 +91615,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -92823,8 +91861,8 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 26; - pixel_y = -32 + pixel_x = 25; + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -92836,8 +91874,8 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26; - pixel_y = -32 + pixel_x = -25; + pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/trunk, @@ -92864,7 +91902,7 @@ "dWu" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -92877,7 +91915,7 @@ /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -92891,11 +91929,13 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, -/obj/structure/chair/stool/bar, +/obj/structure/chair/stool/bar{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dWx" = ( /obj/structure/cable{ d1 = 2; @@ -92980,8 +92020,7 @@ /area/hallway/secondary/exit) "dWK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, @@ -93063,7 +92102,7 @@ /obj/structure/closet/secure_closet/medical1, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -93081,7 +92120,9 @@ /obj/effect/decal/warning_stripes/arrow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/virology) "dWW" = ( /obj/machinery/door/airlock/medical/glass{ @@ -93093,7 +92134,9 @@ /obj/effect/decal/warning_stripes/arrow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/virology) "dWX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -93151,8 +92194,7 @@ level = 2 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + icon_state = "white" }, /area/medical/virology) "dXd" = ( @@ -93176,14 +92218,15 @@ /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dXg" = ( /obj/structure/table/glass, @@ -93193,21 +92236,21 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dXh" = ( /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 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + icon_state = "white" }, /area/medical/virology) "dXi" = ( @@ -93265,8 +92308,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{ @@ -93348,7 +92390,7 @@ pixel_y = -22 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93392,7 +92434,6 @@ /area/maintenance/apmaint) "dXz" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/camera{ @@ -93468,8 +92509,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" @@ -93511,8 +92551,8 @@ /area/hallway/secondary/exit) "dXK" = ( /obj/machinery/light_switch{ - pixel_x = -24; - pixel_y = 24 + pixel_x = -26; + pixel_y = 26 }, /obj/effect/decal/warning_stripes/southwest, /obj/machinery/newscaster{ @@ -93564,8 +92604,7 @@ /area/chapel/office) "dXW" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /obj/machinery/access_button{ command = "cycle_interior"; @@ -93622,7 +92661,7 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/geneticist, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -93637,7 +92676,7 @@ }, /obj/item/storage/box/masks, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -93694,11 +92733,13 @@ }, /area/medical/genetics) "dYm" = ( -/obj/structure/chair/stool/bar, +/obj/structure/chair/stool/bar{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYn" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, @@ -93731,11 +92772,11 @@ "dYt" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYu" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYw" = ( /obj/effect/decal/warning_stripes/northwest, /obj/effect/decal/cleanable/dirt, @@ -93748,10 +92789,8 @@ /area/medical/research) "dYy" = ( /obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/turf/simulated/floor/wood, +/area/maintenance/abandonedbar) "dYz" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, @@ -93759,7 +92798,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYA" = ( /obj/effect/decal/warning_stripes/west, /obj/effect/decal/cleanable/dirt, @@ -93800,14 +92839,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; @@ -93884,14 +92921,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, @@ -93900,14 +92935,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; @@ -93929,8 +92962,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -93949,8 +92981,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -94012,7 +93043,7 @@ /obj/structure/rack, /obj/item/storage/secure/briefcase, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -94151,7 +93182,7 @@ /obj/machinery/door/airlock/external{ name = "Escape Pod" }, -/turf/space, +/turf/simulated/floor/plating, /area/maintenance/port) "emr" = ( /obj/effect/spawner/window/reinforced, @@ -94202,7 +93233,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "esa" = ( -/obj/structure/cable, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -94215,6 +93245,15 @@ /obj/structure/chair{ dir = 1 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -94305,14 +93344,13 @@ /turf/space, /area/space) "eCs" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -94330,6 +93368,10 @@ /obj/item/shield/riot, /obj/item/shield/riot, /obj/item/shield/riot, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -94404,13 +93446,12 @@ /turf/simulated/wall/r_wall, /area/security/securearmoury) "eQg" = ( +/obj/machinery/biogenerator, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, -/obj/machinery/biogenerator, /turf/simulated/floor/plasteel, /area/security/permabrig) "eQh" = ( @@ -94635,14 +93676,16 @@ /area/security/seceqstorage) "fuR" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + 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 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -94728,7 +93771,9 @@ }, /area/security/securearmoury) "fFd" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -94773,6 +93818,10 @@ icon_state = "redcorner" }, /area/security/brig) +"fIn" = ( +/obj/structure/chair/stool, +/turf/simulated/floor/plating, +/area/maintenance/abandonedbar) "fJA" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_uplift, @@ -94795,7 +93844,6 @@ /obj/item/restraints/handcuffs, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -94940,19 +93988,6 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"gsy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/office) "gwn" = ( /obj/structure/cable{ d1 = 4; @@ -95029,7 +94064,7 @@ "gzU" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95230,7 +94265,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -95267,8 +94302,8 @@ dir = 6 }, /obj/machinery/camera{ - c_tag = "Perma-Brig Solitary"; - network = list("SS13","Security") + c_tag = "Perma-Brig Solitary 1"; + network = list("SS13","Security","Prison") }, /obj/structure/cable{ d1 = 4; @@ -95335,8 +94370,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 @@ -95463,7 +94497,6 @@ network = list("Medical","SS13") }, /obj/machinery/status_display{ - layer = 4; pixel_y = -32 }, /obj/item/reagent_containers/spray/cleaner{ @@ -95666,6 +94699,11 @@ icon_state = "neutralfull" }, /area/atmos) +"imS" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/simulated/floor/wood, +/area/crew_quarters/fitness) "ipD" = ( /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ @@ -95673,6 +94711,9 @@ icon_state = "red" }, /area/security/permabrig) +"irt" = ( +/turf/simulated/wall, +/area/maintenance/abandonedbar) "isz" = ( /obj/structure/cable{ d1 = 1; @@ -95688,7 +94729,7 @@ "iuU" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "iwQ" = ( /obj/machinery/light_switch{ pixel_y = 26 @@ -95747,14 +94788,19 @@ }, /turf/simulated/floor/engine, /area/toxins/mixing) +"iFl" = ( +/turf/simulated/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, +/area/maintenance/abandonedbar) "iFx" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, /obj/item/radio/intercom{ - pixel_x = -26; - pixel_y = -12 + pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -95770,7 +94816,7 @@ "iIw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95784,15 +94830,15 @@ /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/machinery/light_switch{ - pixel_x = -26; - pixel_y = -4 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/wood, /area/medical/psych) "iKj" = ( /obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = -5 + dir = 4; + pixel_x = -26 }, /obj/machinery/holosign_switch{ id = "surgery2"; @@ -95987,7 +95033,7 @@ "jqB" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -96004,8 +95050,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -96091,6 +95136,9 @@ icon_state = "cult" }, /area/magistrateoffice) +"jET" = ( +/turf/simulated/wall, +/area/clownoffice) "jFV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -96116,7 +95164,7 @@ name = "Cabin" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "jIs" = ( /turf/simulated/wall/r_wall, /area/security/evidence) @@ -96143,8 +95191,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -96273,7 +95320,7 @@ /obj/structure/rack, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/ammo_box/shotgun/rubbershot, /obj/item/storage/box/rubbershot, @@ -96290,13 +95337,6 @@ }, /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, @@ -96314,13 +95354,18 @@ "klk" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/machinery/light/small, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -96360,15 +95405,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"kpI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "kxq" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -96385,6 +95421,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -96506,18 +95548,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/security/warden) -"kYo" = ( -/obj/machinery/power/solar{ - name = "Aft Starboard Solar Panel" - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plasteel/airless{ - icon_state = "solarpanel" - }, -/area/maintenance/auxsolarstarboard) "lah" = ( /obj/machinery/dye_generator, /obj/machinery/alarm{ @@ -96559,10 +95589,7 @@ req_access = null; req_access_txt = "1" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/security/brig) "lmR" = ( /obj/machinery/vending/security, @@ -96575,6 +95602,9 @@ icon_state = "red" }, /area/security/seceqstorage) +"lqK" = ( +/turf/simulated/wall, +/area/hallway/primary/central/nw) "lso" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -96750,6 +95780,9 @@ icon_state = "red" }, /area/security/permabrig) +"lTi" = ( +/turf/simulated/floor/wood, +/area/maintenance/abandonedbar) "lVO" = ( /obj/machinery/turretid/lethal{ control_area = "\improper Telecoms Central Compartment"; @@ -96847,8 +95880,7 @@ /area/security/permasolitary) "mhT" = ( /obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32; - pixel_y = null + pixel_x = -32 }, /obj/machinery/chem_heater, /turf/simulated/floor/engine, @@ -96984,7 +96016,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -96998,8 +96030,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97037,8 +96068,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{ @@ -97050,8 +96080,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -97232,7 +96261,7 @@ /area/hallway/secondary/entry) "mYH" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97366,7 +96395,7 @@ /obj/machinery/washing_machine, /obj/machinery/camera{ c_tag = "Perma-Brig General Population East"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97415,7 +96444,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97432,7 +96461,7 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97446,14 +96475,19 @@ /turf/simulated/floor/plating, /area/crew_quarters/theatre) "nDV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/chair{ dir = 1 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -97524,7 +96558,7 @@ /obj/machinery/recharger, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -97606,7 +96640,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -97614,16 +96648,6 @@ icon_state = "redcorner" }, /area/security/brig) -"nZa" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "oaB" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -97677,11 +96701,11 @@ /obj/machinery/camera{ c_tag = "Perma-Brig General Population West"; dir = 4; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97718,9 +96742,9 @@ /area/space/nearstation) "osS" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -97797,6 +96821,21 @@ "oEG" = ( /turf/simulated/floor/plating, /area/space/nearstation) +"oFL" = ( +/obj/machinery/cryopod/right, +/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{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "oHv" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -97841,12 +96880,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"oQs" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) "oSH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -97856,8 +96889,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{ @@ -97866,8 +96898,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -97938,10 +96969,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"pfE" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/space) "pgF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -97991,12 +97018,10 @@ /area/security/seceqstorage) "pjY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -98005,10 +97030,15 @@ "plm" = ( /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{ icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "pnF" = ( /obj/structure/window/reinforced, /turf/space, @@ -98062,6 +97092,16 @@ icon_state = "whitebluecorner" }, /area/hallway/primary/central) +"pEn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "pGk" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/railing{ @@ -98114,11 +97154,6 @@ }, /area/medical/research) "pOq" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) @@ -98237,8 +97272,8 @@ "pXX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera{ - c_tag = "Perma-Brig Solitary"; - network = list("SS13","Security") + c_tag = "Perma-Brig Solitary 2"; + network = list("SS13","Security","Prison") }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -98259,6 +97294,7 @@ /area/security/permasolitary) "qcA" = ( /obj/docking_port/stationary{ + dir = 8; dwidth = 4; height = 11; id = "trade_dock"; @@ -98276,15 +97312,6 @@ icon_state = "red" }, /area/security/permabrig) -"qfH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/maintenance/apmaint) "qgr" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -98292,7 +97319,6 @@ }, /area/medical/surgery1) "qli" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -98300,8 +97326,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -98310,6 +97335,7 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/permabrig) "qmW" = ( @@ -98342,19 +97368,6 @@ "qrT" = ( /turf/simulated/wall/r_wall, /area/tcommsat/chamber) -"qxp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/apmaint) "qzr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98370,6 +97383,11 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/south) +"qCd" = ( +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/maintenance/abandonedbar) "qHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; @@ -98593,8 +97611,7 @@ "rje" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -4 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -98636,7 +97653,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "rkV" = ( /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, @@ -98644,6 +97661,10 @@ /obj/structure/rack, /turf/simulated/floor/plating, /area/maintenance/port) +"rlI" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plating, +/area/maintenance/abandonedbar) "rmq" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -98669,7 +97690,7 @@ /obj/structure/table/wood, /obj/item/storage/box/donkpockets, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98708,8 +97729,7 @@ /area/toxins/mixing) "rCw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -98750,7 +97770,7 @@ "rHU" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98882,20 +97902,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -98903,6 +97910,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -98953,8 +97970,7 @@ "shi" = ( /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /obj/machinery/door/poddoor{ density = 0; @@ -99064,11 +98080,11 @@ dir = 8; icon_state = "neutralfull" }, -/area/space) +/area/quartermaster/storage) "suy" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /obj/machinery/camera{ @@ -99096,6 +98112,16 @@ icon_state = "white" }, /area/toxins/misc_lab) +"szk" = ( +/obj/structure/closet/secure_closet/security, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/security/seceqstorage) "sAW" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/plasteel{ @@ -99167,6 +98193,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -99247,13 +98278,15 @@ }, /area/security/brig) "sYw" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" +/obj/machinery/sleeper{ + dir = 4 }, -/area/medical/medbay) +/obj/effect/decal/warning_stripes/northeast, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "sYQ" = ( /obj/structure/cable{ d1 = 4; @@ -99318,9 +98351,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, @@ -99365,9 +98396,7 @@ }, /area/medical/research) "tks" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/security/detectives_office) "tmo" = ( /obj/structure/closet/secure_closet/security, @@ -99387,6 +98416,16 @@ }, /turf/simulated/floor/plasteel, /area/security/permasolitary) +"tsc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "tsN" = ( /obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/plasteel{ @@ -99409,11 +98448,16 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "txW" = ( /obj/structure/cable{ d1 = 4; @@ -99421,7 +98465,7 @@ icon_state = "4-8" }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -99524,7 +98568,6 @@ /area/medical/research) "tNq" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -99667,8 +98710,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -99786,7 +98828,6 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -99808,6 +98849,10 @@ icon_state = "dark" }, /area/security/interrogation) +"usr" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/hallway/primary/central/nw) "uza" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 @@ -99837,6 +98882,9 @@ /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) +"uGp" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/fitness) "uJk" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle, @@ -99923,6 +98971,10 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"uZo" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/security/permabrig) "vbN" = ( /obj/machinery/camera{ c_tag = "Exterior Armory"; @@ -100124,11 +99176,16 @@ "vzs" = ( /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/crew_quarters/sleep) +/area/crew_quarters/fitness) "vzz" = ( /obj/machinery/light{ dir = 4 @@ -100235,19 +99292,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/port) -"vGB" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/port) "vJs" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -100271,10 +99315,6 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) -"vKt" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_2) "vKB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100330,13 +99370,11 @@ }, /area/hallway/secondary/exit) "vUu" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" +/obj/item/radio/intercom{ + pixel_x = 28 }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) @@ -100510,11 +99548,6 @@ icon_state = "vault" }, /area/security/securearmoury) -"wMv" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) "wPI" = ( /obj/structure/cable{ d1 = 1; @@ -100526,17 +99559,7 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office) -"wRP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) +/area/quartermaster/sorting) "wVr" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -100630,8 +99653,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, @@ -100667,21 +99689,6 @@ }, /turf/simulated/floor/plasteel, /area/security/securearmoury) -"xoq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/apmaint) "xpu" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -100761,9 +99768,9 @@ /turf/simulated/floor/grass, /area/medical/research) "xCC" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/port) +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_2) "xDn" = ( /obj/structure/sign/electricshock{ pixel_y = 32 @@ -100800,20 +99807,10 @@ "xIo" = ( /obj/structure/bed, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /turf/simulated/floor/plating, /area/security/brig) -"xKG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) "xKN" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -100841,6 +99838,9 @@ icon_state = "neutralfull" }, /area/hallway/primary/starboard) +"xPn" = ( +/turf/simulated/wall/rust, +/area/maintenance/abandonedbar) "xQW" = ( /obj/structure/cable{ d1 = 4; @@ -100940,6 +99940,9 @@ }, /turf/simulated/floor/plating, /area/security/brig) +"yeh" = ( +/turf/simulated/floor/plating, +/area/maintenance/abandonedbar) "yez" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "1" @@ -108044,7 +107047,7 @@ bms bms bpu bms -aaa +vXX bNM bPH bSr @@ -108566,7 +107569,7 @@ hzl bXI chE bNM -aaa +vXX bpu bms bms @@ -108803,7 +107806,7 @@ aaa ops bpo brs -aaa +vXX btd btd btd @@ -109317,7 +108320,7 @@ oBS adM bpo brs -aaa +vXX btd bvz bwH @@ -110859,7 +109862,7 @@ oMO fPS bJP brs -aaa +vXX btd bvz bwH @@ -111373,7 +110376,7 @@ aaa pnF bJP brs -aaa +vXX btd btd btd @@ -111650,7 +110653,7 @@ bTL bXI bXM bNM -aaa +vXX bpm bmo bmo @@ -112156,7 +111159,7 @@ bmo bmo bpm bmo -aaa +vXX bNM bRt bXI @@ -117812,7 +116815,7 @@ aaa aaa abj abj -nZa +bUJ abj coi abj @@ -118069,7 +117072,7 @@ aaa aaa abj aaa -nZa +bUJ aaa csr aaa @@ -118326,7 +117329,7 @@ aaa aaa abj aaa -nZa +bUJ aaa csr aaa @@ -118583,7 +117586,7 @@ aaa aaa abj abj -nZa +bUJ abj coi abj @@ -118840,7 +117843,7 @@ aaa aaZ abj aaa -nZa +bUJ aaa csr aaa @@ -119097,7 +118100,7 @@ aaa aaa abj abj -nZa +bUJ aaa csr aaa @@ -119121,7 +118124,7 @@ aaa aaa aaa aaa -dmq +aaa dmq dmq dmq @@ -119354,7 +118357,7 @@ aaa aaa aaa aaa -nZa +bUJ abj coi abj @@ -119376,10 +118379,10 @@ aaa aaa aaa aaa +aaa cRD cRD cRD -vKt xCC cHA cXX @@ -119611,7 +118614,7 @@ aaa aaa dij abj -nZa +bUJ aaa csr aaa @@ -119633,11 +118636,11 @@ aaa aaa aaa aaa -cTg +aaa cUP cUQ vUu -xCC +cIu elb drn drn @@ -119868,7 +118871,7 @@ acF acF dij aaa -nZa +bUJ aaa csr aaa @@ -119890,18 +118893,18 @@ aaa aaa aaa aaa +aaa cRD cRD cRD -vKt xCC cHA sPz cXU cHA -bya -pfE -pfE +cHA +cJK +cJK cHA cHA aaa @@ -120125,7 +119128,7 @@ bwN acF abj abj -nZa +bUJ abj coi abj @@ -120382,7 +119385,7 @@ bwN acF dij aaa -nZa +bUJ aaa csr aaa @@ -120409,7 +119412,7 @@ cie cie bXU xtS -cPY +cWn drn dhG drn @@ -120422,8 +119425,8 @@ cHA aaa abj seE -bPS -vXX +cHA +aaa aaa aaa aaa @@ -120639,7 +119642,7 @@ bwN abj dij aaa -nZa +bUJ aaa csr aaa @@ -120666,7 +119669,7 @@ bXU bXU bXU iPQ -cPY +cWn drn cHA cHA @@ -120680,7 +119683,7 @@ aaa cHA kdR cHA -vXX +aaa aaa aaa aaa @@ -120896,7 +119899,7 @@ bwN abj abj abj -nZa +bUJ abj coi abj @@ -121153,7 +120156,7 @@ bwN abj dij aaa -nZa +bUJ aaa csr aaa @@ -121194,7 +120197,7 @@ aaa cHA fxr cHA -vXX +aaa aaa aaa aaa @@ -121410,7 +120413,7 @@ bwN abj abj aaa -nZa +bUJ aaa csr aaa @@ -121666,7 +120669,7 @@ bGs bwN abj bVs -wRP +bXG bYJ abj csr @@ -122227,9 +121230,9 @@ abj aaa dbz dbz -aMW +irt dbz -aMW +irt dbz dbz aaa @@ -122483,11 +121486,11 @@ abj abj abj dbz -aOs +rlI dhu dhv dWw -aUp +yeh dbz abj abj @@ -122735,21 +121738,21 @@ dfd cIx cWn dsr -cHA -aMW +irt +irt dbz -aMW +irt dbz -aUp -aRj +yeh +qCd duT dYm -aRm +lTi dbz -aMW +irt dbz -aMW -aMW +irt +irt abj aaa aaa @@ -122949,7 +121952,7 @@ bDi bEL bzL bwN -bKa +bNX bMd bNW bUP @@ -122992,21 +121995,21 @@ cJR cJM cWp cXU -cCx +xPn dae -aUp +yeh dcM daf -aRm +lTi dhv duT dYm -aRm +lTi dmM dou dpR -aOs -aMW +rlI +irt abj aaa aaa @@ -123250,14 +122253,14 @@ cUR cWq drn cLz -aUp +yeh dnH dcX -aUp +yeh dYu -aRm -aRm -aRm +lTi +lTi +lTi dYt dnH dnH @@ -123508,19 +122511,19 @@ cWr cXX cLz dbG -aUp -aRm -aSP -aUp +yeh +lTi +iFl +yeh dhw diY dkr dYt -oQs -oQs +dYu +dYu dcX dqZ -aMY +xPn abj aaa aaa @@ -123766,7 +122769,7 @@ dlM cLz dag dcX -dcO +fIn deA dfM dfM @@ -123774,7 +122777,7 @@ dfM dfM dfM dmN -wMv +lTi dcX dra dbz @@ -124020,7 +123023,7 @@ cTk cIx cFY cXY -cHA +irt dah dbD dcP @@ -124029,13 +123032,13 @@ dcX dcX dfN dfN -aUp +yeh dmO -aSP -wMv -wMv -aUp -aUp +iFl +lTi +lTi +yeh +yeh dbz aaa abj @@ -124277,23 +123280,23 @@ cLH cIx cWt cXY -cHA +irt dai dbE -aRm +lTi deC dcX dnH -aUp +yeh dks dcX dmO -aUp +yeh dYy drb -aSP +iFl dtJ -aMW +irt abj acF aaa @@ -124534,8 +123537,8 @@ cTl cIx cWt dsr -cHA -aOs +irt +rlI dfU dcR deD @@ -124543,12 +123546,12 @@ dfN dcX diZ dfN -aUp +yeh dmO dYt dYy drc -aUp +yeh dtK dbz aaa @@ -124791,23 +123794,23 @@ cJW cIx cWt dhG -cHA +irt daj dbE dmM deD dfN -aUp +yeh dfN dcX dcX dmO -wMv +lTi dYy drd -wMv +lTi dtL -aMW +irt abj acF aaa @@ -125048,21 +124051,21 @@ cjH cUS cXS drn -cHA -aUp +irt +yeh dfU dcT deD -aUp -aUp -aUp +yeh +yeh +yeh dcX dfN dmO -oQs +dYu dYz drc -aUp +yeh dlK dbz aaa @@ -125316,7 +124319,7 @@ dfO dkt dlI dmP -aSP +iFl dcX dre dbz @@ -125570,13 +124573,13 @@ drb dfP dra dja -aSP -aRm +iFl +lTi dmQ -wMv +lTi dcX drf -aMW +irt abj aaa aaa @@ -125828,7 +124831,7 @@ dcX dcX dcX dcX -aUp +yeh dcX dcX dnH @@ -126077,20 +125080,20 @@ cIx cFU cYd cLz -aOs +rlI dbJ dcX deG dcX -aUp -aOs +yeh +rlI dkv dlK dlK daf -aUp -aOs -aMW +yeh +rlI +irt abj aaa aaa @@ -128350,7 +127353,7 @@ bKr bMw bQs bOn -bSk +bQt bUv bWu clo @@ -129941,9 +128944,9 @@ dhH djk cAS cAS -vGB +dna doA -kpI +cAS dro dIf cHA @@ -130743,7 +129746,7 @@ dNy dFg dOO dPr -qxp +deW dQM dcA dbp @@ -132027,7 +131030,7 @@ dHs dNC dFg dEi -xoq +dPw dQe dRj dRB @@ -133062,7 +132065,7 @@ dRF dkh dSq dTg -qfH +dOQ dTW abj aaa @@ -133202,7 +132205,7 @@ aOt aPN aRn aSR -aUs +aSP aVV aMW bqe @@ -133459,7 +132462,7 @@ aOu aPO aRo aQq -aUt +aUp aOs aMW bqe @@ -133716,7 +132719,7 @@ aMW aMV aMW aQw -aUu +aXe aMW aMW bqe @@ -133974,8 +132977,8 @@ aTk aFy aRu aUv -apU -aXy +aor +aCn aYT baH bce @@ -134036,7 +133039,7 @@ cIO cIO cIO cIL -cPa +cQP cPe cQU cSg @@ -134218,21 +133221,21 @@ aAq awX aCn aDt -aFx -aFx -aFx -aFx -aFx -aFx -aFx -aFx -aOx -aOx -aOx +lqK +lqK +lqK +lqK +lqK +lqK +lqK +lqK +jET +jET +jET aSS -aOx -aOx -aOx +jET +jET +jET bqe baF bcf @@ -134437,7 +133440,7 @@ aeb aeO aeb aeb -afK +akb agf agB aeb @@ -134475,25 +133478,25 @@ ayg awX aCo aEz -aFx +lqK aFs aGo aHA -aFx +lqK aKh aLE aNa -aOx +jET aPP aRp aSU aUx aVY -aOx +jET aXJ baF bcg -bdA +bjh beX baF bhz @@ -134732,21 +133735,21 @@ aAr awX aor aEy -aFx +lqK aFt aGp aHB -aFx +lqK aKi aLF cAq -aOx +jET aPQ aRq aST aUy aVZ -aOx +jET bpZ baF bch @@ -134989,21 +133992,21 @@ aDH ayC auR aDw -aFx +lqK aFu aGq aHC -aFx +lqK aKj aLG aNc -aOx +jET aPR aRr aSW aUz aWa -aOx +jET byM baF bci @@ -135114,7 +134117,7 @@ dRu dPE dQi dQU -gsy +dRu dRM dSe dRM @@ -135246,21 +134249,21 @@ aor aqF azb aEz -aFx +lqK aHQ aGr aFv -aFx +lqK aMD aLH aNd -aOx +jET aPS aPw aSX aUy aWb -aOx +jET bqe baF bcj @@ -135503,21 +134506,21 @@ aBD aBD aES aDx -aFx +lqK aFw aJt cyT -aFx +lqK aKl aNX cAq -aOx +jET aPT aOn aSV aUA aWc -aOx +jET aYV baF bck @@ -135760,21 +134763,21 @@ axb axb axb aDy -aFx -aFx +lqK +lqK aGs -aFx -aFx -aFx +lqK +lqK +lqK aLI -aFx -aOx -aOx -aOx +lqK +jET +jET +jET aSY -aOx -aOx -aOx +jET +jET +jET aYW baF baF @@ -135784,7 +134787,7 @@ baF bhE bjm blb -bmW +usr bol bqm buU @@ -136020,17 +135023,17 @@ aDz aEv aFr aLJ -aRt +aUC aIR aKm aLJ aNf -aRt -aRt -aRt +aUC +aUC +aUC aSZ aUC -aRt +aUC aXz aYX baK @@ -136275,18 +135278,18 @@ aBv aCq aDD aEJ -aUD +aXA aRv aHH aHS aIU -aUD +aXA aNg -aUD -aUD +aXA +aXA aRv aTa -aUD +aXA aWd aXA aYY @@ -136294,11 +135297,11 @@ baL bcm bdH bfd -aFx +lqK bhG bjo bld -bmW +usr boo bqu bIX @@ -136788,7 +135791,7 @@ aAv aBy aCr aEw -aDt +aor aFA aGv aHJ @@ -137045,7 +136048,7 @@ aAw aBz aCs aEC -aDt +aor aFA aGw aHK @@ -137302,7 +136305,7 @@ aAx aBA axb aDE -aEy +aLA aFA aGx aHM @@ -137559,7 +136562,7 @@ gpU axb axb aDF -aEy +aLA aFA aGy aHM @@ -137682,7 +136685,7 @@ dNK dOt dOZ dOr -dMj +dyT dRa dRA dJx @@ -137816,7 +136819,7 @@ aAy axd aCt aDG -aEz +azb aFA aGz aHN @@ -137930,15 +136933,15 @@ dku dHA ddy dJx -dKm +duw dKr dKO -dKm +duw dJx -dKm +duw dJx dJx -dKm +duw dJx dJx dJx @@ -138330,7 +137333,7 @@ aBu aCw aCu axe -aDt +aor aFA aGA aMg @@ -138587,7 +137590,7 @@ aAA axe axe axe -aDt +aor aFA aGB aMi @@ -138844,7 +137847,7 @@ aAB aCw aEO axe -aEz +azb aFA aGC aMg @@ -139101,7 +138104,7 @@ aAB axe axe axe -aEz +azb aFA aGD aHP @@ -139615,7 +138618,7 @@ aAD axe aAz aAz -aEz +azb aFA aGF aIZ @@ -139872,7 +138875,7 @@ aAE aEB aCx axe -aHW +aUv aFA aGG aHR @@ -140129,7 +139132,7 @@ axe axe axe axe -aHX +ckl aFA aFA aFA @@ -140386,7 +139389,7 @@ bhO bhO bhO bhO -aED +bhO aFB aGH bhO @@ -140643,7 +139646,7 @@ aAG aXX aXX aXX -aGI +aXX aXZ aGI aXX @@ -140923,7 +139926,7 @@ bhY bhY blq bhY -bSB +bhY bMb bov aXY @@ -141159,16 +140162,16 @@ ayA ayA ayA ayA -aGK +ayA aHT -aJd -aJd +aEP +aEP aQp -aJd -aGK -aGK -aGK -aGK +aEP +ayA +ayA +ayA +ayA aGK aJd aXK @@ -141416,16 +140419,16 @@ aCA aDK aEG aFD -aGK +ayA aHU -aJd +aEP aMa aLW aNl aOJ aQe aRL -aGK +ayA aUN aWn aXL @@ -141673,16 +140676,16 @@ ayA ayA aDL ayA -aGK +ayA aIh aEN aNx -aUU -aNm +aQl +aCF aOK aQf aRM -aJd +aEP aUO aWo aNm @@ -141935,7 +140938,7 @@ aEM aEN aNp aLY -aZi +aUV aOL aQg aRN @@ -141965,7 +140968,7 @@ bAB bCv byU bFy -bHn +cHe bOT bOT bOT @@ -142141,14 +141144,14 @@ aaa aaa aaa aaa -abj -abj -abj aaa -abj +aaa aaa aaa abj +abj +aaa +aaa aaa acC afb @@ -142189,14 +141192,14 @@ aDM aFF aEL aJg -aJf +aCC aKy aLZ aNo wPI aQh aRO -aJd +aEP aUU aWr aXP @@ -142396,17 +141399,17 @@ aaa aaa aaa aaa -adb -acC -acC -acC -adb -adb -adb -acC -acC -adb -acC +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +abj +aaa acC ahF acC @@ -142444,16 +141447,16 @@ aCC aCC aEK aFJ -aGK +ayA aKv aKx aKx aNy aTi aOM -aQi -aGK -aGK +aDS +ayA +ayA aUR aWr aXP @@ -142653,27 +141656,27 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj acC -adg +aip aeg -aeg -acC -cQs -cQv -adZ -adZ -agm -age -adZ -adZ -adZ -adZ adZ adZ adZ adZ adZ aip +adZ agA alG adZ @@ -142910,27 +141913,27 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acC -adz -aeg -aeg -cJL -afh -aea -aea -afM -ajZ -ahg -ajZ -ajZ +agJ ajZ ajZ cMP ajZ ajZ ajZ -ajZ ahg +ahi ajZ ajZ ajZ @@ -142956,17 +141959,17 @@ aAO aBK aCE aDN -aDP +aBM aFI -ayD -ayD -aFR -aFR +aGK +aGK +aJd +aJd aOw -ayD -ayD -aFR -aFR +aGK +aGK +aJd +aJd aTn aUT aWs @@ -143167,26 +142170,26 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acC -adh -adh -adh -acC -afj +aec +aeB +aeb +aeb aeb aeb -afN -agn -agH -aiT -aiT -aiT -aiT -aiT -aiT -aiT akb -aiT +agB fuR aiT alK @@ -143215,7 +142218,7 @@ aCF aCI aDR aJi -ayD +aGK aIa aJj aKB @@ -143424,28 +142427,28 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa adb -aeK -cFP -aeK +adb +adb +aeM adb adb adb adb -afa adb -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN +aUu +adb axm axm awY @@ -143472,18 +142475,18 @@ aCG aDj aEH aFK -ayD +aGK aIb -aRX -aEU +aJf +aQi aMd aNr aOP -aQl +aNm aRR aNv -aUV -aWs +aUU +aWr aNm aNm bbc @@ -143681,28 +142684,28 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa adb -cFN -cGw -cFN +aeC +aeN +aff adb -aeL -afd -afx -afP -ago -adN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afk +afz +agp +aXy +bKa akB alJ alZ @@ -143727,9 +142730,9 @@ aAR aCH aCH aDQ -aEP +aCH aFL -wXI +aDP aIc aMe aKD @@ -143938,28 +142941,28 @@ aaa aaa aaa aaa -adN -cFN -cHe -cFN +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa adb -aeM -afe -afy -afQ -agp -adN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeK +aeQ +aeK +adb +afl +afB +agq +bdA +bSk akB alX ama @@ -143986,15 +142989,15 @@ ayA aDS ayA ayA -ayD -ayD -aFR +aGK +aGK +aJd aKE -aFR -ayD -ayD -aFR -aFR +aJd +aGK +aGK +aJd +aJd aTn ayD bai @@ -144196,27 +143199,27 @@ aaa aaa aaa aaa -cFN -cIu -cFN +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa adb -aeN -aff -afz -afR -agq -adN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeL +afa +aeL +adb +afm +afC +agH +bya +bSB akB auu amb @@ -144456,24 +143459,24 @@ aaa aaa aaa aaa -aeB -aeB +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeL +afd +aeL afg -aeB -aeB -aeC -adN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afg +afM +afg +afg +afi akB alM amc @@ -144711,26 +143714,26 @@ aaa aaa aaa aaa -dij +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeL +afe +aeL +afg +afn +afN +aED +afg abj -aeB -dtF -duO -dGZ -aeB -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alN amd @@ -144968,25 +143971,25 @@ aaa aaa aaa aaa -dij -dij -aeC -dtG +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa afi -afB -aeB -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afx +afP +aUs +afg aaa akB alO @@ -145221,30 +144224,30 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaZ aaa aaa aaa aaa aaa -aeB -aeQ -afk -afC -aeB +afg +afy +afQ +aUt +afg abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alP ajI @@ -145484,24 +144487,24 @@ aaa aaa aaa aaa -aeC -aeC -afl -aeC -aeC +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +afi +afi +afR +afi +afi abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alQ amf @@ -145518,7 +144521,7 @@ asM atR asK qWs -ayS +axm osS wXI ixB @@ -145741,24 +144744,24 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj -aeC -afm -aeC +afi +agm +afi abj abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alR amg @@ -145775,7 +144778,7 @@ asN auJ asJ avn -awy +axm aBZ ayD azM @@ -145999,23 +145002,23 @@ aaa aaa aaa aaa -aeC -afn -aeC +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +afi +agn +afi abj abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alS ajJ @@ -146032,7 +145035,7 @@ amG auO apo avq -awy +axm axw ayD azN @@ -146246,6 +145249,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -146257,22 +145272,10 @@ aaa aaa aaa abj -aec +ago abj abj aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alT ajL @@ -146289,7 +145292,7 @@ asO atS auy avr -awy +axm aCd ayD azO @@ -146499,6 +145502,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -146514,22 +145529,10 @@ dij aGW dij abj -acp +adg abj abj abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alQ amG @@ -146546,7 +145549,7 @@ amh amh are asd -awz +asd axx asd azP @@ -146756,37 +145759,37 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa aaa abj aaa aaa -kYo ace -aco +acf +acG aaa aaa abj aaa aaa abj -acp +adg aaa abj abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB axm amh @@ -146892,8 +145895,8 @@ cYP cYP cYP cYP -cJg -cJg +cUr +cUr daZ ctj ddU @@ -147013,37 +146016,37 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa -kYo ace -aco -aaa -kYo acf -aco +acG aaa -kYo ace -aco +acg +acG +aaa +ace +acf +acG aaa abj -acp +adg abj abj abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB abj acF @@ -147141,18 +146144,18 @@ buF boG cJo bRw -cKY +bng cOd -cKO -cKO -cKO +cJL +cOe +cWd cUj -cKO -cKO -sYw +cXq cZM -kjL -cwc +sYw +cUr +cKO +cFo cSA cJg dgS @@ -147270,22 +146273,34 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa -kYo -acf -aco +ace +acg +acG aaa -kYo -acf -aco +ace +acg +acG aaa -kYo -acf -aco +ace +acg +acG aaa abj -acp +adg aaa abj abj @@ -147294,18 +146309,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm aoi dZP @@ -147398,17 +146401,17 @@ dzi cTa cJp bRF -cKY +bng cOe -cMq -cMq -cMq +cPa +cOd +cWd cUk -ckl -dbi -dbi -cZN -dbi +dcE +dcE +cZQ +dbu +cMq cFo dfE cKY @@ -147527,22 +146530,34 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij abj -kYo -acf -aco +ace +acg +acG abj -kYo -acf -aco +ace +acg +acG abj -kYo -acf -aco +ace +acg +acG abj abj -acp +adg aaa abj aaa @@ -147551,18 +146566,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZP dZR @@ -147655,16 +146658,16 @@ xQW boG boG bSe -cKY -dbn -cKV -cKV -cKV -cRo -cNW -cKV -cKV -dci +bng +cJL +cQs +cQv +cWd +cTg +dcE +cZN +cZQ +dbu cMq ctd cSA @@ -147679,8 +146682,8 @@ dpA cSA cSA cSA -duw cSA +dtG dwK dgW cSA @@ -147784,22 +146787,34 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj aaa -kYo -acf -aco +ace +acg +acG aaa -kYo -acf -aco +ace +acg +acG aaa -kYo -acf -aco +ace +acg +acG aaa abj -acp +adg abj abj aaa @@ -147808,18 +146823,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZO dZQ @@ -147832,7 +146835,7 @@ asd asd avw aqG -axB +atW auE abj abj @@ -147913,16 +146916,16 @@ cMz cMz cMz cMz -cOg -cOg +cMz +cMz cMz cSO -cUr cXl -dbu -cUr +dcE +daa +dbi dbs -cMp +dtF dcv ded dgB @@ -148038,37 +147041,37 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aGW dij dij abj -kYo -acf -aco +ace +acg +acG aaa aaa -acE +adh aaa aaa -kYo -acf -aco +ace +acg +acG aaa abj -acp -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +adg aaa aaa aaa @@ -148175,10 +147178,10 @@ cPU cRt cMz cUs -cXq dcE +daa cZp -cUr +deV cKV cwo cSF @@ -148295,13 +147298,25 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa abj aaa aaa aaa -acg +ach aaa aaa aaa @@ -148309,27 +147324,15 @@ acF aaa aaa aaa -acg +ach abj abj abj -acp +adg aaa abj aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa dZG aaa aaa @@ -148469,7 +147472,7 @@ dFG aaa dQH dNW -deV +dRf dMy dNl dRi @@ -148552,25 +147555,37 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj abj +acp abv -xKG -xKG -xKG -ach -acp -acp -acp -acp -acp -acp -acp -acp -acp -acp -acp -acp +abv +abv +aci +adg +adg +adg +adg +adg +adg +adg +adg +adg +adg +adg +adg aaa abj aaa @@ -148584,22 +147599,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asR -atW +asc auZ awE azS @@ -148688,7 +147691,7 @@ cOi cMC cSP cOg -daa +cVU cXz cpc cZQ @@ -148809,13 +147812,25 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa abj aaa aaa aaa -aci +acj aaa aaa aaa @@ -148823,7 +147838,7 @@ acF aaa aaa aaa -aci +acj abj abj abj @@ -148841,24 +147856,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asS -atX +asc +avv avv -auD awF axE asd @@ -149066,22 +148069,34 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij dij dij abj -kYo -acj +ace aco -aaa -aaa acG aaa aaa -kYo -acj +adz +aaa +aaa +ace aco +acG abj dij aaa @@ -149098,18 +148113,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asT @@ -149326,33 +148329,33 @@ aaa aaa aaa aaa -dij aaa -kYo -acj -aco aaa -kYo -acj -aco aaa -kYo -acj -aco +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa dij aaa +ace +aco +acG aaa +ace +aco +acG aaa +ace +aco +acG aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dij aaa aaa aaa @@ -149583,19 +148586,31 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aGW abj -kYo -acj +ace aco +acG abj -kYo -acj +ace aco +acG abj -kYo -acj +ace aco +acG abj dij aaa @@ -149611,18 +148626,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa abj @@ -149757,7 +148760,7 @@ dLe dOd dMC dOd -dOd +duO dOG dPj dPS @@ -149840,33 +148843,33 @@ aaa aaa aaa aaa -dij aaa -kYo -acj -aco aaa -kYo -acj -aco aaa -kYo -acj -aco +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa dij aaa +ace +aco +acG aaa +ace +aco +acG aaa +ace +aco +acG aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dij aaa aaa aaa @@ -150097,19 +149100,31 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa -kYo -dyT -aco +ace +acE +acG aaa -kYo -acj +ace aco +acG aaa -kYo -dyT -aco +ace +acE +acG aaa abj aaa @@ -150137,18 +149152,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa acF acF acF @@ -150354,15 +149357,27 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij aaa aaa abj aaa aaa -kYo -dyT -aco +ace +acE +acG aaa aaa abj @@ -150397,18 +149412,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -150477,10 +149480,10 @@ crX cBQ cnP cnP -aFx -aFx +csi +csi cIa -aFx +csi cLl cMI cQa @@ -150611,6 +149614,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150644,18 +149659,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaZ aaa aaa @@ -150737,7 +149740,7 @@ cnP cFl cGP cIb -aFx +csi cRy cMJ des @@ -150872,6 +149875,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150908,18 +149923,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj abj abj @@ -150959,10 +149962,10 @@ eSX bFX bFX bEr -bFX +bLy bMc bFX -bLy +bFX bFX bFX bRd @@ -150993,8 +149996,8 @@ cDn cuJ cFm cGQ -cIc -aFx +cJz +csi dlw bng cWd @@ -151251,7 +150254,7 @@ bDB cFn cGR cId -aFx +csi cME diP cOo @@ -151507,8 +150510,8 @@ cDp cvV cFv cGS -cIk -aFx +cWh +csi cLn cbm cbm @@ -151709,7 +150712,7 @@ mhu mhu tOM mhu -aml +cFP bbn ygH bex @@ -151756,21 +150759,21 @@ csc cnP cnP cnP -cnP -cnP -cnP -cnP -cnP -cnP +csi +csi +csi +csi +csi +csi cFw bHg cIm -aFx -aFx -aFx -aFx -aFx -aFx +csi +csi +csi +csi +csi +csi cSX dDE cXI @@ -151980,7 +150983,7 @@ boO bru bsF bvl -bqK +bvn nDV bCN bzh @@ -152013,21 +151016,21 @@ bRc cqI brS cqI -aFx -cyT -aFv +csi +bEY +cIc cBV cDq -aFx +csi cFq cGT cIg -aFx -cAq +csi +uGp iuU cOp -aKh -aFx +imS +csi cSY dDE cXI @@ -152237,7 +151240,7 @@ boP bqO bsG btY -bqO +cGw klk bno bzj @@ -152270,21 +151273,21 @@ bTg khY cuF cqI -aFx +csi cyU -aFv -aFv -aFv -cEt -bEY -cGV cIc +cIc +cIc +cEt +cFx +cGW +cJz jHd -cAq -cAq +uGp +uGp cOq cQe -aFx +csi cSZ cUw dlz @@ -152320,7 +151323,7 @@ abj dFH dHp dIn -dJi +dJY dJY dIc aaa @@ -152527,21 +151530,21 @@ bgt bwR ckV brS -aFx +csi cyV cAn -aFw -aHA -aFx -bEY -cGV +cIj +cIk +csi +cFx +cGW cIh -aFx +csi cLo cMM -cAq +uGp cQf -aFx +csi boG cUx dlz @@ -152793,12 +151796,12 @@ oNd cFr cGW cIi -aFx -aFx -aFx -aFx -aFx -aFx +csi +csi +csi +csi +csi +csi cSY cUy dlz @@ -153047,15 +152050,15 @@ cAo cBW fqy nFX -bEY -cGV -cIc -aFx +cFx +cGW +cJz +csi cLp cMN cOr cQg -aFx +csi cTa dDE dlz @@ -153306,13 +152309,13 @@ wtE cEu cFs rkJ -cIj +cAu cJy cLp cMO cLp cQi -aFx +csi cSY dDE dlz @@ -153562,14 +152565,14 @@ cBX aKk nFX cFv -cGV -cIk -aFx +cGW +cWh +csi cLq cLp cLp cQh -aFx +csi cTb dDD dlz @@ -153819,14 +152822,14 @@ oNd oNd oNd cFu -cGV -cIk -aFx -aFx -aFx -aFx -aFx -aFx +cGW +cWh +csi +csi +csi +csi +csi +csi cjn dDE dlz @@ -154076,12 +153079,12 @@ cBY why bmW cFv -cGV +cGW cIl bmW oXY cBY -cyY +oFL cyY aFx cTc @@ -154335,10 +153338,10 @@ cEv tvI vzs plm -cEv +cPY sOo -cAr -cAr +pEn +tsc cQj aFx cSY @@ -157391,7 +156394,7 @@ rNi iVV miL frI -tmo +szk jQY aaa abj @@ -157871,7 +156874,7 @@ abj aIO aNS aPi -aQJ +cFN aSt aTP aVy @@ -159678,7 +158681,7 @@ abj aJx bac abQ -abQ +uZo aJx aaa aaa