From 0369cb49a0c931b20f00b4a0ffe13cb4a8af27b1 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:15:15 +0100 Subject: [PATCH 01/21] mislabelled cams, poor wiring, medbay useless hallway, wrong fax machines, missing keycard machine --- _maps/map_files/Delta/delta.dmm | 1036 +++++++++++++------------------ 1 file changed, 426 insertions(+), 610 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 8e1481707a9..63d58b59e89 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -447,11 +447,6 @@ /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "afa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/airlock/engineering{ name = "Aux Construction Site" }, @@ -5195,7 +5190,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" @@ -5203,7 +5198,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; @@ -10093,6 +10087,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" @@ -10128,11 +10127,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; @@ -10520,6 +10514,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" = ( @@ -10533,11 +10532,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{ @@ -10565,11 +10559,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 }, @@ -10592,16 +10581,11 @@ }, /area/maintenance/fore) "aED" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) +/turf/simulated/floor/plasteel, +/area/maintenance/fore) "aEF" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -10649,16 +10633,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) @@ -10991,6 +10965,11 @@ }, /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" @@ -11035,11 +11014,6 @@ /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{ @@ -11114,11 +11088,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) @@ -11563,7 +11532,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" @@ -11571,7 +11542,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" @@ -12056,11 +12029,6 @@ /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; @@ -12173,17 +12141,12 @@ 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" @@ -12206,15 +12169,6 @@ }, /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) "aHX" = ( /obj/structure/cable{ d1 = 4; @@ -12722,6 +12676,16 @@ /obj/machinery/newscaster{ pixel_x = -32 }, +/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" @@ -12753,17 +12717,10 @@ /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" @@ -13374,16 +13331,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 @@ -13391,6 +13338,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" @@ -13433,6 +13385,11 @@ }, /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" @@ -13994,11 +13951,6 @@ }, /area/maintenance/fore) "aLD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light/small{ dir = 4 }, @@ -14057,6 +14009,11 @@ /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" @@ -14648,6 +14605,11 @@ }, /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" @@ -14655,11 +14617,6 @@ /area/crew_quarters/sleep) "aNg" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -16162,6 +16119,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" = ( @@ -16221,6 +16183,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" = ( @@ -16677,37 +16644,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 }, @@ -17276,8 +17225,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 @@ -17294,6 +17243,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ + name = "Entertainment Office"; req_access_txt = "46" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17408,11 +17358,6 @@ /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 @@ -17420,6 +17365,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -17427,27 +17387,12 @@ /area/crew_quarters/sleep) "aTa" = ( /obj/structure/disposalpipe/junction, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/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" - }, /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" @@ -17563,11 +17508,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, @@ -18187,45 +18127,30 @@ }, /area/maintenance/gambling_den) "aUs" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/megaphone, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkbluefull" }, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" - }, -/area/maintenance/gambling_den) +/area/bridge) "aUt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2" }, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "aUu" = ( -/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) +/obj/effect/decal/cleanable/blood/gibs, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "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) @@ -18287,24 +18212,15 @@ }, /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) @@ -19093,11 +19009,6 @@ /area/crew_quarters/theatre) "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; @@ -19896,18 +19807,15 @@ /turf/simulated/floor/engine/air, /area/atmos) "aXy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/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, -/area/maintenance/fore) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "aXz" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -19915,6 +19823,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -19922,16 +19839,6 @@ /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" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -20582,24 +20489,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{ @@ -20641,32 +20533,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 }, +/obj/structure/cable{ + d1 = 1; + 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/crew_quarters/sleep) "aYY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/effect/landmark{ name = "lightsout" }, @@ -21559,11 +21446,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" @@ -21598,17 +21480,17 @@ /obj/effect/decal/warning_stripes/south, /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) "baL" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -22340,11 +22222,6 @@ /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, @@ -22406,25 +22283,19 @@ 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, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /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" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -22954,11 +22825,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; @@ -22966,11 +22832,6 @@ }, /area/hydroponics) "bdz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -22980,25 +22841,10 @@ }, /area/hydroponics) "bdA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "greenblue" - }, -/area/hydroponics) +/obj/item/reagent_containers/food/snacks/candy/candybar, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bdB" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -23052,7 +22898,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -23081,9 +22926,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; @@ -23092,6 +22937,11 @@ }, /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" @@ -23099,14 +22949,9 @@ /area/crew_quarters/sleep) "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 @@ -38410,6 +38255,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" @@ -46884,6 +46730,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" = ( @@ -46899,6 +46753,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" = ( @@ -47495,8 +47357,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 = 28 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -47747,6 +47612,11 @@ }, /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" = ( @@ -49221,6 +49091,7 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cdI" = ( @@ -49365,6 +49236,7 @@ dir = 8 }, /obj/machinery/recharger, +/obj/item/megaphone, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cdZ" = ( @@ -51991,18 +51863,9 @@ /turf/simulated/floor/wood, /area/library) "ckl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) +/obj/effect/decal/cleanable/blood/footprints, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "ckm" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -54167,7 +54030,7 @@ /area/construction/hallway) "cpc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -57670,25 +57533,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" @@ -57732,8 +57576,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -61868,8 +61712,12 @@ 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 }, @@ -65975,36 +65823,13 @@ /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, @@ -68222,9 +68047,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 @@ -68795,28 +68625,35 @@ /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 = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"cUk" = ( +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 25 }, /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, @@ -68884,9 +68721,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; @@ -69152,6 +68986,10 @@ }, /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 @@ -69164,16 +69002,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, @@ -70265,16 +70093,10 @@ }, /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" = ( @@ -70320,14 +70142,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" = ( @@ -70352,8 +70170,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" }, @@ -70367,12 +70185,6 @@ 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 }, @@ -70407,6 +70219,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" @@ -70869,6 +70687,12 @@ 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" }, @@ -71060,10 +70884,8 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cZp" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northeast, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -71284,29 +71106,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" }, @@ -71397,10 +71221,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" = ( @@ -71959,12 +71784,10 @@ }, /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" - }, -/area/medical/medbay) +/obj/structure/disposalpipe/segment, +/obj/structure/sign/examroom, +/turf/simulated/wall, +/area/medical/medbay3) "dbj" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -72032,9 +71855,16 @@ /turf/simulated/wall, /area/medical/surgery) "dbs" = ( -/obj/structure/sign/examroom, -/turf/simulated/wall, -/area/medical/medbay3) +/obj/machinery/camera{ + c_tag = "Medbay East Hallway"; + dir = 4; + network = list("Medical","SS13") + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitebluecorner" + }, +/area/medical/medbay) "dbt" = ( /obj/structure/cable{ d1 = 1; @@ -72043,6 +71873,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" }, @@ -72611,12 +72443,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 }, @@ -73456,6 +73284,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" @@ -78624,6 +78454,10 @@ }, /area/crew_quarters/hor) "doN" = ( +/obj/machinery/keycard_auth{ + pixel_x = 38; + pixel_y = -26 + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -81302,15 +81136,15 @@ /area/medical/cmo) "duw" = ( /obj/machinery/camera{ - c_tag = "Mini Satellite Access"; + c_tag = "Virology south"; dir = 4; - network = list("SS13","MiniSat") + network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitebluecorner" + icon_state = "whitegreencorner" }, -/area/medical/medbay) +/area/medical/virology) "dux" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -87101,7 +86935,6 @@ /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"; @@ -87236,11 +87069,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" @@ -88853,10 +88687,6 @@ }, /area/medical/virology) "dLc" = ( -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /obj/machinery/shower{ dir = 8 }, @@ -88901,10 +88731,6 @@ dir = 4; pixel_x = 28 }, -/obj/machinery/camera{ - c_tag = "Mining Dock External"; - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -89296,6 +89122,11 @@ "dLY" = ( /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/camera{ + c_tag = "Virology decontamination"; + dir = 4; + network = list("Medical","SS13") + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dMa" = ( @@ -90522,10 +90353,6 @@ }, /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 @@ -92657,7 +92484,6 @@ /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"; @@ -94871,7 +94697,7 @@ /obj/machinery/door/airlock/external{ name = "Escape Pod" }, -/turf/space, +/turf/simulated/floor/plating, /area/maintenance/port) "emr" = ( /obj/effect/spawner/window/reinforced, @@ -96843,13 +96669,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, @@ -99676,13 +99495,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; @@ -100655,10 +100476,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 @@ -100714,13 +100531,12 @@ }, /area/hallway/secondary/exit) "vUu" = ( -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2" +/obj/item/radio/intercom{ + dir = 4; + 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) @@ -101131,9 +100947,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 @@ -119491,7 +119307,7 @@ aaa aaa aaa aaa -dmq +aaa dmq dmq dmq @@ -119746,10 +119562,10 @@ aaa aaa aaa aaa +aaa cRD cRD cRD -vKt xCC cHA cXX @@ -120003,11 +119819,11 @@ aaa aaa aaa aaa -cTg +aaa cUP cUQ vUu -xCC +aUt elb drn drn @@ -120260,10 +120076,10 @@ aaa aaa aaa aaa +aaa cRD cRD cRD -vKt xCC cHA sPz @@ -133572,7 +133388,7 @@ aOt aPN aRn aSR -aUs +aSP aVV aMW bqe @@ -133829,7 +133645,7 @@ aOu aPO aRo aQq -aUt +aUp aOs aMW bqe @@ -134086,7 +133902,7 @@ aMW aMV aMW aQw -aUu +aXe aMW aMW bqe @@ -134344,8 +134160,8 @@ aTk aFy aRu aUv -apU -aXy +aor +aCn aYT baH bce @@ -134863,7 +134679,7 @@ aOx aXJ baF bcg -bdA +bjh beX baF bhz @@ -136390,17 +136206,17 @@ aDz aEv aFr aLJ -aRt +aUC aIR aKm aLJ aNf -aRt -aRt -aRt +aUC +aUC +aUC aSZ aUC -aRt +aUC aXz aYX baK @@ -136645,18 +136461,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 @@ -137158,7 +136974,7 @@ aAv aBy aCr aEw -aDt +aor aFA aGv aHJ @@ -137415,7 +137231,7 @@ aAw aBz aCs aEC -aDt +aor aFA aGw aHK @@ -137672,7 +137488,7 @@ aAx aBA axb aDE -aEy +aLA aFA aGx aHM @@ -137929,7 +137745,7 @@ axb axb axb aDF -aEy +aLA aFA aGy aHM @@ -138186,7 +138002,7 @@ aAy axd aCt aDG -aEz +azb aFA aGz aHN @@ -138700,7 +138516,7 @@ aBu aCw aCu axe -aDt +aor aFA aGA aMg @@ -138957,7 +138773,7 @@ aAA axe axe axe -aDt +aor aFA aGB aMi @@ -139214,7 +139030,7 @@ aAB aCw aEO axe -aEz +azb aFA aGC aMg @@ -139471,7 +139287,7 @@ aAB axe axe axe -aEz +azb aFA aGD aHP @@ -139985,7 +139801,7 @@ aAD axe aAz aAz -aEz +azb aFA aGF aIZ @@ -140242,7 +140058,7 @@ aAE aEB aCx axe -aHW +aUv aFA aGG aHR @@ -140499,7 +140315,7 @@ axe axe axe axe -aHX +aED aFA aFA aFA @@ -140756,7 +140572,7 @@ bhO bhO bhO bhO -aED +bhO aFB aGH bhO @@ -141013,7 +140829,7 @@ aAG aXX aXX aXX -aGI +aXX aXZ aGI aXX @@ -142335,7 +142151,7 @@ bAB bCv byU bFy -bHn +aUs bOT bOT bOT @@ -144308,7 +144124,7 @@ aaa aaa aaa aaa -adN +aaa cFN cHe cFN @@ -147262,8 +147078,8 @@ cYP cYP cYP cYP -cJg -cJg +cUr +cUr daZ ctj ddU @@ -147511,18 +147327,18 @@ buF boG cJo bRw -cKY +bng cOd -cKO -cKO -cKO +aUu +cOe +cWd cUj -cKO -cKO -sYw +cXq cZM -kjL -cwc +sYw +cUr +cKO +cFo cSA cJg dgS @@ -147768,17 +147584,17 @@ dzi cTa cJp bRF -cKY +bng cOe -cMq -cMq -cMq +aXy +cOd +cWd cUk -ckl -dbi -dbi -cZN -dbi +dcE +dcE +cZQ +dbu +cMq cFo dfE cKY @@ -148025,16 +147841,16 @@ xQW boG boG bSe -cKY -dbn -cKV -cKV -cKV -cRo -cNW -cKV -cKV -dci +bng +aUu +bdA +ckl +cWd +cTg +dcE +cZN +cZQ +dbu cMq ctd cSA @@ -148049,8 +147865,8 @@ dpA cSA cSA cSA -duw cSA +dbs dwK dgW cSA @@ -148283,15 +148099,15 @@ cMz cMz cMz cMz -cOg -cOg +cMz +cMz cMz cSO -cUr cXl +dcE +daa +cZQ dbu -cUr -dbs cMp dcv ded @@ -148545,11 +148361,11 @@ cPU cRt cMz cUs -cXq dcE +daa cZp -cUr -cKV +dbi +cKU cwo cSF dil @@ -149058,7 +148874,7 @@ cOi cMC cSP cOg -daa +cVU cXz cpc cZQ @@ -150127,7 +149943,7 @@ dLe dOd dMC dOd -dOd +duw dOG dPj dPS From b5efe31fe0f58f4b7970d99879be35c24bbcf8be Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 2 Oct 2021 00:50:48 +0100 Subject: [PATCH 02/21] There was never a pipe under a wall --- _maps/map_files/Delta/delta.dmm | 44 +++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 63d58b59e89..68b8fb91b00 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -57576,8 +57576,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -70885,7 +70885,9 @@ /area/maintenance/port) "cZp" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -71784,7 +71786,6 @@ }, /area/toxins/mixing) "dbi" = ( -/obj/structure/disposalpipe/segment, /obj/structure/sign/examroom, /turf/simulated/wall, /area/medical/medbay3) @@ -72425,8 +72426,8 @@ /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" @@ -97113,6 +97114,14 @@ icon_state = "grimy" }, /area/chapel/office) +"lKV" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay3) "lVO" = ( /obj/machinery/turretid/lethal{ control_area = "\improper Telecoms Central Compartment"; @@ -98308,6 +98317,15 @@ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) +"plU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/medbay3) "pnF" = ( /obj/structure/window/reinforced, /turf/space, @@ -98657,6 +98675,12 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/south) +"qBB" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay) "qHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; @@ -148106,9 +148130,9 @@ cSO cXl dcE daa -cZQ -dbu -cMp +plU +lKV +qBB dcv ded dgB @@ -148365,7 +148389,7 @@ dcE daa cZp dbi -cKU +cKV cwo cSF dil From 044be9b598ade7e8d8dd05a1d240ec3cfa1cd0eb Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 2 Oct 2021 17:59:22 +0100 Subject: [PATCH 03/21] delta cameras --- _maps/map_files/Delta/delta.dmm | 34 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 68b8fb91b00..4be94ba5093 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -12280,7 +12280,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, @@ -13442,7 +13442,7 @@ "aKr" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ - c_tag = "Bar"; + c_tag = "Bar North"; dir = 4; pixel_y = -22 }, @@ -15860,7 +15860,7 @@ }, /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" @@ -17481,7 +17481,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Cargo Disposals Sorting"; dir = 1 }, /obj/effect/decal/warning_stripes/east, @@ -18364,7 +18364,7 @@ "aUS" = ( /obj/structure/table, /obj/machinery/camera{ - c_tag = "Medbay Lobby East" + c_tag = "Cargo office" }, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -19363,7 +19363,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, @@ -20578,7 +20578,7 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Atrium"; + c_tag = "Bar South"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20764,7 +20764,7 @@ pixel_x = -24 }, /obj/machinery/camera{ - c_tag = "Cargo Office SouthWest"; + c_tag = "Cargo Dock SouthWest"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20829,7 +20829,7 @@ pixel_y = -24 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Quartermaster Office"; dir = 1 }, /turf/simulated/floor/plasteel{ @@ -25935,7 +25935,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{ @@ -43736,16 +43736,6 @@ icon_state = "yellowcorner" }, /area/hallway/primary/port) -"bSB" = ( -/obj/machinery/camera{ - c_tag = "Fore Hallway South"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" - }, -/area/hallway/primary/fore) "bSC" = ( /obj/structure/cable{ d1 = 1; @@ -76925,7 +76915,7 @@ "dlm" = ( /obj/machinery/light, /obj/machinery/camera{ - c_tag = "Medbay Psych Office Corridor East"; + c_tag = "Medbay Cloning"; dir = 1 }, /obj/machinery/bodyscanner, @@ -141133,7 +141123,7 @@ bhY bhY blq bhY -bSB +bhY bMb bov aXY From 8d696c86ce4288dbaa44aa62d57c128e379a4e47 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:30:54 +0100 Subject: [PATCH 04/21] removes centcomm doors --- _maps/map_files/Delta/delta.dmm | 74 +++++++++++++++++---------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 4be94ba5093..25f91eaa922 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -50501,7 +50501,9 @@ icon_state = "1-2" }, /obj/machinery/light_switch{ - pixel_x = 25 + dir = 8; + pixel_x = 25; + pixel_y = -2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -79617,6 +79619,7 @@ /area/maintenance/port) "drp" = ( /obj/machinery/button/windowtint{ + dir = 1; pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, @@ -82704,10 +82707,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{ @@ -84099,10 +84100,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{ @@ -84799,10 +84798,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{ @@ -88406,10 +88403,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" }, @@ -88521,9 +88514,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{ @@ -88549,13 +88541,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" }, @@ -89563,9 +89555,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" @@ -90156,9 +90148,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, @@ -91784,9 +91775,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{ @@ -91988,9 +91978,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{ @@ -92629,9 +92618,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{ @@ -95067,6 +95055,10 @@ icon_state = "white" }, /area/hallway/primary/central) +"fgT" = ( +/obj/effect/spawner/window/reinforced/polarized, +/turf/simulated/floor/plating, +/area/chapel/main) "fhF" = ( /turf/space, /area/shuttle/gamma/station) @@ -99481,6 +99473,16 @@ icon_state = "red" }, /area/security/seceqstorage) +"sVr" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 28 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "chapel" + }, +/area/chapel/main) "sWi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -137882,7 +137884,7 @@ dNK dOt dOZ dOr -dMj +sVr dRa dRA dJx @@ -138130,15 +138132,15 @@ dku dHA ddy dJx -dKm +fgT dKr dKO -dKm +fgT dJx -dKm +fgT dJx dJx -dKm +fgT dJx dJx dJx From 15cbb8392c3c2789e58c65e66457eb045df25c23 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:34:02 +0100 Subject: [PATCH 05/21] fixes safe not giving codes --- _maps/map_files/Delta/delta.dmm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 25f91eaa922..18221a85888 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -34499,7 +34499,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, From 93a66e26c3250e7be4d24f542ae61407379662fd Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Mon, 4 Oct 2021 19:02:12 +0100 Subject: [PATCH 06/21] stealth bins --- _maps/map_files/Delta/delta.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 18221a85888..0c616ed5f06 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -72922,7 +72922,6 @@ }, /area/maintenance/apmaint) "ddw" = ( -/obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ From 9b859f286891d80822ca05a21f978901545d4035 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 9 Oct 2021 21:48:24 +0100 Subject: [PATCH 07/21] disconnected APCs, pixel shifted holopads --- _maps/map_files/Delta/delta.dmm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 4b3b0ff450e..345d7e7bb3c 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -63595,6 +63595,10 @@ pixel_x = -5; pixel_y = -5 }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -69399,9 +69403,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/hologram/holopad{ - pixel_y = -16 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77388,6 +77390,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" }, @@ -78107,6 +78114,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" }, From 6cf9d3ab14945d7c9e201a6c61e6eaeea23a728e Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 9 Oct 2021 22:41:51 +0100 Subject: [PATCH 08/21] the great var edit purge --- _maps/map_files/Delta/delta.dmm | 4769 +++++++++++++------------------ 1 file changed, 2009 insertions(+), 2760 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 345d7e7bb3c..bbca737c442 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"; @@ -358,7 +367,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 +392,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 +425,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,32 +447,26 @@ /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" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_4) "afa" = ( -/obj/machinery/door/airlock/engineering{ - name = "Aux Construction Site" +/obj/item/radio/intercom{ + pixel_y = 28 }, -/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, @@ -475,6 +479,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, @@ -483,7 +585,7 @@ icon_state = "brown" }, /area/hallway/secondary/entry) -"afe" = ( +"afB" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -497,7 +599,7 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry) -"aff" = ( +"afC" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -511,7 +613,21 @@ 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) +"afK" = ( +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"afM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -526,11 +642,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" @@ -540,23 +678,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 @@ -573,12 +704,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; @@ -592,212 +722,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 @@ -828,7 +752,6 @@ /area/hallway/secondary/entry) "agg" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -839,7 +762,6 @@ /area/hallway/secondary/entry) "agh" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -861,57 +783,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" = ( @@ -949,16 +899,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{ @@ -1260,8 +1204,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) @@ -1340,24 +1283,19 @@ /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/structure/cable, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 }, -/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) +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plating, +/area/maintenance/auxsolarstarboard) "akw" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -1446,7 +1384,6 @@ /area/hallway/secondary/entry) "alu" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/camera{ @@ -1478,7 +1415,6 @@ /area/hallway/secondary/entry) "aly" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1503,7 +1439,6 @@ /area/space) "alG" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -1527,7 +1462,6 @@ /area/maintenance/fore2) "alK" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1537,8 +1471,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) @@ -1593,7 +1526,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; @@ -1684,8 +1617,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -1977,7 +1909,7 @@ dir = 1 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2205,7 +2137,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 @@ -2266,7 +2198,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) @@ -2284,7 +2216,7 @@ pixel_y = 25 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -2518,7 +2450,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -2538,7 +2470,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" @@ -2557,7 +2489,7 @@ "aoY" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /turf/simulated/floor/wood, /area/security/vacantoffice) @@ -2622,11 +2554,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; @@ -2660,7 +2592,7 @@ "apl" = ( /obj/structure/filingcabinet, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -3265,7 +3197,7 @@ /area/maintenance/fore) "aqI" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -3846,7 +3778,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/computer/security{ @@ -4268,14 +4199,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, @@ -4329,14 +4258,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; @@ -4469,7 +4396,7 @@ /obj/structure/table/wood, /obj/item/phone, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4487,7 +4414,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4568,7 +4495,7 @@ "atB" = ( /obj/structure/filingcabinet, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -4593,7 +4520,7 @@ "atD" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -4665,8 +4592,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4767,8 +4693,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4902,7 +4827,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; @@ -4970,7 +4895,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) @@ -6544,8 +6469,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6563,8 +6487,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6582,8 +6505,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{ @@ -6600,8 +6522,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ @@ -6620,8 +6541,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -6719,8 +6639,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, @@ -6897,7 +6816,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, @@ -6958,7 +6877,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 @@ -7329,7 +7248,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) @@ -7479,7 +7398,7 @@ "azD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7542,8 +7461,7 @@ /area/quartermaster/storage) "azJ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7583,7 +7501,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; @@ -7599,8 +7517,7 @@ /area/quartermaster/storage) "azP" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ @@ -8418,6 +8335,7 @@ icon_state = "1-8" }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /obj/item/reagent_containers/glass/bucket, @@ -8750,8 +8668,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 @@ -8825,7 +8742,7 @@ }, /obj/effect/decal/cleanable/vomit, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plating, /area/crew_quarters/toilet) @@ -10351,7 +10268,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) @@ -10480,7 +10397,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, @@ -10581,7 +10498,7 @@ "aGn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -10590,7 +10507,7 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -10647,8 +10564,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 28 + pixel_x = -26 }, /obj/machinery/bottler, /turf/simulated/floor/plasteel{ @@ -10704,7 +10620,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; @@ -10903,8 +10819,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/seed_extractor, /turf/simulated/floor/plasteel, @@ -10913,8 +10828,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -10922,8 +10836,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11318,7 +11231,7 @@ "aHR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -11408,11 +11321,10 @@ /area/quartermaster/storage) "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{ @@ -11423,7 +11335,7 @@ "aIc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -11438,7 +11350,8 @@ "aId" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -11533,8 +11446,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11626,8 +11538,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 @@ -11645,8 +11556,7 @@ network = list("SS13","Engineering") }, /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -11736,7 +11646,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -11865,7 +11775,7 @@ /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; @@ -12195,8 +12105,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, @@ -12369,8 +12278,7 @@ icon_state = "0-2" }, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -12395,7 +12303,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -12576,7 +12484,6 @@ /area/crew_quarters/sleep) "aKm" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12684,8 +12591,7 @@ /area/hallway/primary/fore) "aKv" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -13102,7 +13008,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -13163,7 +13069,7 @@ "aLE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -13230,8 +13136,7 @@ pixel_x = -24 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -13384,12 +13289,10 @@ /area/quartermaster/office) "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; @@ -13551,7 +13454,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, @@ -13653,7 +13556,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, @@ -13738,8 +13641,7 @@ pixel_x = 32 }, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13837,7 +13739,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -14276,7 +14178,7 @@ "aNZ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/alarm{ dir = 8; @@ -14542,7 +14444,6 @@ /area/crew_quarters/bar) "aOI" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -14777,8 +14678,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/igniter{ id = "Incinerator"; @@ -14896,12 +14796,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; @@ -14910,7 +14808,7 @@ /area/atmos) "aPz" = ( /obj/item/radio/intercom{ - pixel_y = 22 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -14980,8 +14878,7 @@ /area/atmos) "aPG" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15059,7 +14956,7 @@ }, /obj/structure/closet/secure_closet/clown, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" @@ -15360,7 +15257,7 @@ "aQt" = ( /obj/structure/chair/stool/bar, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -15372,7 +15269,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/southwestcorner, @@ -15549,7 +15445,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -15658,7 +15554,7 @@ /area/atmos) "aRa" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -22 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/shower{ @@ -15962,7 +15858,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{ @@ -15970,12 +15866,12 @@ 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; @@ -16162,11 +16058,10 @@ /obj/item/folder/blue, /obj/item/healthanalyzer, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -16865,7 +16760,6 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -17406,7 +17300,7 @@ /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{ @@ -17517,8 +17411,7 @@ pixel_y = 3 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -17752,7 +17645,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -18641,7 +18534,7 @@ "aWN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -18693,7 +18586,6 @@ /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -18721,7 +18613,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -18732,7 +18624,7 @@ dir = 5 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -19046,7 +18938,7 @@ /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; @@ -19079,8 +18971,7 @@ name = "Theater Stage" }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -19101,7 +18992,6 @@ /area/atmos) "aXH" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -19547,7 +19437,8 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19575,7 +19466,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; @@ -19792,7 +19683,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -19892,11 +19783,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; @@ -19997,8 +19889,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; @@ -20017,8 +19909,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" @@ -20291,7 +20182,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{ @@ -20357,7 +20248,6 @@ "aZZ" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -20665,7 +20555,6 @@ "baK" = ( /obj/machinery/door/firedoor, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/south, @@ -20736,7 +20625,7 @@ "baR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -20784,12 +20673,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; @@ -20867,12 +20757,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; @@ -21028,7 +20916,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21146,9 +21034,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 @@ -21244,7 +21130,7 @@ /area/shuttle/pod_3) "bbJ" = ( /obj/item/radio/intercom{ - pixel_y = 25 + pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -21253,7 +21139,6 @@ /area/shuttle/pod_3) "bbK" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/machinery/light, @@ -21418,8 +21303,7 @@ /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, @@ -21434,8 +21318,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, @@ -21461,7 +21344,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/chem_master/condimaster, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -21524,8 +21407,7 @@ /area/crew_quarters/kitchen) "bcs" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/gibber, /obj/effect/decal/warning_stripes/south, @@ -21632,7 +21514,6 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -21708,8 +21589,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" @@ -22323,7 +22203,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -22624,7 +22503,7 @@ "beL" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ @@ -22795,7 +22674,7 @@ "bfe" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -22841,7 +22720,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" @@ -22945,15 +22824,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, @@ -23122,7 +23000,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{ @@ -23548,8 +23426,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, @@ -23791,8 +23668,7 @@ /area/atmos) "bho" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Atmospherics South"; @@ -23907,13 +23783,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, @@ -24349,8 +24225,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -24473,8 +24348,7 @@ icon_state = "4-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Security Briefing Room North"; @@ -24529,7 +24403,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/effect/landmark/start{ @@ -25251,8 +25125,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 @@ -25271,14 +25144,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; @@ -25407,8 +25278,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Security Interrogation Room"; @@ -25437,7 +25307,7 @@ "bkn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/computer/secure_data{ dir = 8 @@ -25496,8 +25366,7 @@ "bks" = ( /obj/machinery/photocopier, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -25788,7 +25657,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) @@ -25988,7 +25857,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -26150,14 +26019,12 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -26175,7 +26042,7 @@ /obj/structure/closet/secure_closet/brigdoc, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -26338,8 +26205,7 @@ }, /obj/item/folder/red, /obj/machinery/keycard_auth{ - pixel_x = 26; - pixel_y = 10 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -26352,10 +26218,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" @@ -26385,7 +26252,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -26604,7 +26471,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) @@ -27185,7 +27052,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/east, @@ -27314,7 +27180,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27438,7 +27304,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27477,7 +27343,7 @@ icon_state = "pipe-c" }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -27875,8 +27741,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -27886,8 +27751,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"; @@ -27901,8 +27765,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -27912,8 +27775,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/computer/crew{ dir = 8 @@ -27932,8 +27794,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; @@ -28205,8 +28066,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, @@ -28382,7 +28242,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) @@ -29335,7 +29195,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, @@ -29468,7 +29328,7 @@ "bsr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -29513,8 +29373,7 @@ /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, @@ -29717,15 +29576,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; @@ -30141,7 +30000,6 @@ /area/security/nuke_storage) "btR" = ( /obj/item/radio/intercom{ - pixel_x = -6; pixel_y = -28 }, /obj/effect/decal/warning_stripes/northeast, @@ -30308,8 +30166,7 @@ /area/security/interrogation) "buf" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -30364,7 +30221,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -30497,7 +30354,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -30519,7 +30376,7 @@ /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "escape" @@ -30934,7 +30791,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -31026,8 +30883,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31050,8 +30906,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 @@ -31161,7 +31016,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -31662,7 +31517,7 @@ /area/security/prisonershuttle) "bwA" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigEast"; @@ -31766,8 +31621,7 @@ /area/turret_protected/ai) "bwH" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31876,7 +31730,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, @@ -31892,10 +31746,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, @@ -31928,7 +31782,7 @@ network = list("SS13","Engineering") }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32014,7 +31868,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{ @@ -32116,8 +31970,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{ @@ -32349,7 +32202,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{ @@ -32389,14 +32242,21 @@ /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/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) "byb" = ( /obj/structure/cable{ d1 = 4; @@ -32420,8 +32280,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) @@ -32434,8 +32293,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) @@ -32451,8 +32309,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) @@ -32565,7 +32422,7 @@ /area/engine/break_room) "byv" = ( /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -32852,7 +32709,6 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/light{ @@ -32931,7 +32787,6 @@ "byY" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -33248,8 +33103,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, @@ -33273,7 +33127,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -33288,7 +33142,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, @@ -33490,8 +33344,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; @@ -34142,7 +33995,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{ @@ -34168,8 +34021,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -34242,7 +34094,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -34449,7 +34301,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) @@ -34485,8 +34337,7 @@ "bCg" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/item/assembly/igniter, /obj/item/assembly/igniter, @@ -35070,7 +34921,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35165,7 +35015,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35209,7 +35058,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/northeast, @@ -36035,7 +35884,6 @@ pixel_y = -10 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/effect/landmark/start{ @@ -36159,7 +36007,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{ @@ -36171,7 +36019,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/alarm{ dir = 1; @@ -36251,7 +36099,7 @@ "bFc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -36271,16 +36119,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, @@ -36355,7 +36202,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{ @@ -36432,7 +36278,7 @@ /area/bridge) "bFx" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -36446,7 +36292,7 @@ /area/bridge) "bFz" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36603,7 +36449,7 @@ "bFQ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36883,7 +36729,7 @@ "bGw" = ( /obj/effect/decal/warning_stripes/southeast, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -36893,9 +36739,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, @@ -37287,7 +37134,7 @@ "bGV" = ( /obj/machinery/vending/assist, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/camera{ c_tag = "Primary Tool Storage"; @@ -37421,7 +37268,7 @@ "bHi" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -37691,7 +37538,7 @@ /area/maintenance/starboard2) "bHJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/vending/detdrobe, /turf/simulated/floor/plasteel{ @@ -38021,8 +37868,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, @@ -38046,7 +37892,7 @@ /obj/item/clipboard, /obj/item/gps/engineering, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38066,7 +37912,7 @@ "bIv" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38131,8 +37977,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{ @@ -38236,7 +38081,6 @@ "bIQ" = ( /obj/machinery/vending/tool, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow, @@ -38304,7 +38148,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38321,7 +38165,7 @@ /area/bridge/meeting_room) "bJb" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38394,7 +38238,6 @@ /area/crew_quarters/captain) "bJk" = ( /obj/machinery/light_switch{ - pixel_x = 8; pixel_y = 26 }, /obj/machinery/disposal, @@ -38419,14 +38262,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) @@ -38458,8 +38300,7 @@ dir = 1 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -38687,8 +38528,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 @@ -38824,7 +38664,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/door_control{ id = "transitlock"; @@ -39170,7 +39010,7 @@ /area/bridge/meeting_room) "bKM" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/wood, @@ -39199,7 +39039,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) @@ -39223,7 +39063,6 @@ /area/turret_protected/ai_upload) "bKV" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /turf/simulated/floor/bluegrid, @@ -39550,7 +39389,7 @@ "bLO" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39836,9 +39675,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; @@ -39869,6 +39706,7 @@ /obj/item/pen, /obj/machinery/light, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -39921,8 +39759,7 @@ /area/engine/break_room) "bMz" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/vending/chinese, /turf/simulated/floor/plasteel{ @@ -39935,8 +39772,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{ @@ -39950,7 +39786,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/clothing/gloves/color/yellow, /obj/item/storage/toolbox/electrical, @@ -40264,7 +40100,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -40274,7 +40110,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 @@ -40734,7 +40570,7 @@ "bOh" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40797,8 +40633,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; @@ -40819,7 +40654,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, @@ -40838,7 +40673,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, @@ -40851,7 +40686,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) @@ -40979,8 +40814,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) @@ -41064,7 +40899,6 @@ /area/crew_quarters/captain) "bOV" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -41207,7 +41041,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41427,8 +41261,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -41500,8 +41333,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/alarm{ pixel_y = 24 @@ -41562,8 +41394,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -41655,10 +41486,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, @@ -41777,7 +41609,7 @@ "bQj" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41796,8 +41628,7 @@ /area/crew_quarters/chief) "bQl" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/bed, /obj/item/bedsheet/ce, @@ -41881,7 +41712,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, @@ -41976,8 +41807,7 @@ /area/turret_protected/aisat) "bQD" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -41997,7 +41827,6 @@ /area/bridge/meeting_room) "bQF" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/slot_machine, @@ -42220,7 +42049,7 @@ "bRd" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -42405,7 +42234,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43006,7 +42835,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43052,8 +42881,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; @@ -43128,7 +42957,7 @@ /area/hallway/primary/central) "bSW" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43183,7 +43012,6 @@ /area/turret_protected/aisat) "bTd" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/camera{ @@ -43277,7 +43105,6 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /obj/machinery/light{ @@ -43304,7 +43131,7 @@ /obj/item/flashlight/lamp, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/light{ dir = 4 @@ -43351,8 +43178,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 @@ -43374,8 +43200,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 @@ -43396,8 +43221,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 @@ -43450,14 +43274,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, @@ -43691,8 +43513,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 @@ -43890,8 +43711,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" @@ -44123,15 +43944,6 @@ icon_state = "neutralfull" }, /area/hallway/primary/port) -"bUJ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "bUK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -44207,7 +44019,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) @@ -44232,7 +44044,7 @@ /area/crew_quarters/captain) "bUW" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /obj/machinery/camera{ @@ -44253,7 +44065,6 @@ /area/crew_quarters/captain) "bUY" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/carpet/black, @@ -44354,8 +44165,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/lattice/catwalk, /turf/space, @@ -44437,8 +44247,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, @@ -44554,8 +44363,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -44687,7 +44495,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 @@ -44744,7 +44552,7 @@ "bVU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -44760,7 +44568,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -44872,9 +44680,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{ @@ -44999,8 +44805,7 @@ /obj/structure/bed, /obj/item/bedsheet/black, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -45040,7 +44845,7 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45053,7 +44858,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45065,8 +44870,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; @@ -45135,7 +44940,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45492,8 +45297,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -45507,15 +45311,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"bXG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space/nearstation) "bXH" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light, @@ -45558,7 +45353,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45603,7 +45398,7 @@ "bXP" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45731,8 +45526,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/lattice/catwalk, /turf/space, @@ -45834,7 +45628,6 @@ /area/crew_quarters/captain/bedroom) "bYA" = ( /obj/machinery/light_switch{ - pixel_x = -8; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -46408,7 +46201,6 @@ "bZJ" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /obj/machinery/computer/library, @@ -46453,7 +46245,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46463,7 +46255,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 @@ -46480,7 +46272,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46497,7 +46289,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{ @@ -46512,7 +46304,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46566,7 +46357,7 @@ department = "NT Representative's Office" }, /obj/machinery/keycard_auth{ - pixel_x = 28 + pixel_x = 24 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -46645,7 +46436,6 @@ /obj/item/pinpointer, /obj/item/disk/nuclear, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/carpet/black, @@ -46713,7 +46503,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 @@ -46771,7 +46561,7 @@ "caB" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -46789,8 +46579,7 @@ /area/crew_quarters/courtroom) "caD" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 @@ -46813,7 +46602,7 @@ /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, @@ -46855,7 +46644,7 @@ "caK" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/filingcabinet/security, /turf/simulated/floor/wood, @@ -46913,7 +46702,7 @@ "caQ" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -46921,8 +46710,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"; @@ -46983,8 +46773,7 @@ "caV" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47289,7 +47078,7 @@ /area/engine/engineering) "cbx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/structure/cable/yellow{ d2 = 2; @@ -47312,8 +47101,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) @@ -47327,8 +47115,7 @@ "cbE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -47396,7 +47183,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47716,7 +47503,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" @@ -47908,8 +47695,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"; @@ -48421,7 +48207,7 @@ "cdX" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ @@ -48897,9 +48683,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; @@ -49008,7 +48792,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/library) @@ -49035,7 +48819,7 @@ "cfx" = ( /obj/machinery/photocopier, /obj/structure/extinguisher_cabinet{ - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/wood, /area/library) @@ -49048,14 +48832,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) @@ -49068,8 +48852,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, @@ -49205,7 +48989,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, @@ -49313,7 +49097,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -49407,7 +49191,6 @@ "cgo" = ( /obj/structure/closet, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -49422,7 +49205,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49611,7 +49394,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -49717,8 +49500,7 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 25; - pixel_y = -2 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -49765,7 +49547,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, @@ -49934,7 +49717,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/wood, @@ -50032,8 +49814,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50271,7 +50052,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -50297,7 +50078,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/ntrep) @@ -50377,12 +50158,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; @@ -50484,7 +50263,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/blueshield) @@ -50533,7 +50312,7 @@ /obj/machinery/firealarm{ dir = 8; pixel_x = -26; - pixel_y = -28 + pixel_y = -26 }, /obj/structure/cable{ d2 = 4; @@ -50733,7 +50512,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/closet/crate, /obj/item/target/syndicate, @@ -50780,8 +50559,7 @@ /area/security/range) "cjx" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plating, /area/security/range) @@ -51045,12 +50823,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; @@ -51075,7 +50851,7 @@ /area/maintenance/starboard) "ckm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -51097,7 +50873,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -51185,7 +50961,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) @@ -51790,7 +51566,7 @@ /obj/item/camera_film, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/window/reinforced{ dir = 1 @@ -51803,7 +51579,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) @@ -51870,7 +51646,6 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/ian, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/wood, @@ -52051,7 +51826,6 @@ "cmf" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -52241,7 +52015,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) @@ -52255,8 +52029,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, @@ -52279,7 +52052,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, @@ -52364,7 +52136,7 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -52405,8 +52177,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, @@ -52475,7 +52246,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" @@ -52485,7 +52256,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp/green, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/carpet, @@ -52509,7 +52279,7 @@ "cnr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -52533,8 +52303,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) @@ -52586,8 +52356,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, @@ -52752,12 +52522,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; @@ -53547,7 +53315,7 @@ "cpH" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -53974,7 +53742,7 @@ /obj/machinery/vending/coffee, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -54026,7 +53794,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -54041,14 +53809,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{ @@ -54108,8 +53874,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, @@ -54327,7 +54092,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{ @@ -55020,7 +54785,7 @@ "csB" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/item/clipboard, /obj/item/folder/blue, @@ -55441,8 +55206,7 @@ "ctz" = ( /obj/structure/table, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Rec Room Fore" @@ -55499,7 +55263,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, @@ -55573,7 +55337,6 @@ /area/library) "ctN" = ( /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /turf/simulated/floor/plasteel{ @@ -55964,8 +55727,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{ @@ -56000,8 +55762,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 @@ -56245,8 +56006,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) @@ -56260,13 +56020,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, @@ -56366,12 +56124,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" @@ -56379,8 +56135,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 @@ -56405,7 +56160,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56442,7 +56197,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56465,7 +56220,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -56602,7 +56357,7 @@ amount = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, @@ -56681,12 +56436,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" @@ -56760,8 +56513,7 @@ /area/crew_quarters/locker) "cwk" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) @@ -57030,7 +56782,6 @@ /obj/structure/table/wood, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/folder, @@ -57051,7 +56802,7 @@ "cwQ" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57305,7 +57056,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ @@ -57374,12 +57125,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{ @@ -57415,8 +57164,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57438,12 +57186,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" @@ -57475,7 +57221,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, @@ -57590,7 +57336,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 @@ -57659,7 +57405,7 @@ "cyb" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -57867,7 +57613,6 @@ /area/gateway) "cyz" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -57878,7 +57623,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, @@ -57950,7 +57695,6 @@ }, /obj/structure/dispenser/oxygen, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -58100,7 +57844,6 @@ /area/crew_quarters/sleep) "cyU" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/structure/closet/secure_closet/personal/cabinet, @@ -58109,8 +57852,7 @@ /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" @@ -58119,7 +57861,7 @@ "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, @@ -58167,8 +57909,7 @@ /area/crew_quarters/sleep) "cyZ" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Cryodorms Fore" @@ -58183,7 +57924,7 @@ "cza" = ( /obj/machinery/cryopod, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -58305,8 +58046,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, @@ -58755,8 +58495,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 @@ -58831,7 +58570,7 @@ /area/crew_quarters/sleep) "cAo" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -59083,14 +58822,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cAS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/port) "cAT" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -59105,7 +58836,6 @@ "cAU" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -59189,7 +58919,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" @@ -59341,7 +59071,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/storage/belt, /obj/item/radio, @@ -59566,7 +59296,7 @@ "cBV" = ( /obj/structure/chair/office/dark, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -59602,7 +59332,7 @@ "cBY" = ( /obj/machinery/cryopod/right, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -59689,7 +59419,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, @@ -59763,8 +59493,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 @@ -59951,7 +59680,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light, /turf/simulated/floor/carpet, @@ -59995,7 +59724,6 @@ }, /obj/structure/table/wood, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/folder/red, @@ -60010,8 +59738,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, @@ -60162,7 +59890,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" @@ -60271,7 +59999,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) @@ -60443,9 +60171,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" @@ -60679,7 +60405,6 @@ /area/hallway/primary/central) "cEM" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -60741,8 +60466,7 @@ /area/ai_monitored/storage/eva) "cES" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -60751,7 +60475,7 @@ /area/hallway/primary/central) "cET" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -60760,7 +60484,7 @@ /area/hallway/primary/central) "cEU" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -60786,7 +60510,7 @@ /area/hallway/primary/central) "cEY" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -60795,8 +60519,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" @@ -61091,8 +60814,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; @@ -61154,7 +60876,6 @@ dir = 8 }, /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/machinery/camera{ @@ -61180,8 +60901,15 @@ /turf/simulated/floor/plasteel, /area/maintenance/port) "cFN" = ( -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_4) +/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) "cFO" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61190,17 +60918,22 @@ }, /area/maintenance/port) "cFP" = ( -/obj/docking_port/mobile/pod{ - dir = 4; - id = "pod4"; - name = "escape pod 4" +/obj/machinery/door/airlock/engineering{ + name = "Aux Construction Site" }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_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) "cFR" = ( /obj/structure/grille{ density = 0; @@ -61701,14 +61434,22 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cGw" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_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) "cGx" = ( /obj/structure/cable{ d1 = 4; @@ -61717,8 +61458,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; @@ -61818,8 +61558,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{ @@ -61843,12 +61582,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; @@ -61863,8 +61600,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 @@ -61890,8 +61626,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{ @@ -62010,8 +61745,7 @@ /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; @@ -62110,16 +61844,22 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/light, -/obj/structure/chair/comfy/shuttle{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_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) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -62501,7 +62241,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -62602,8 +62342,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, @@ -62620,9 +62359,14 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cIu" = ( -/obj/effect/spawner/window/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/pod_4) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/hallway/secondary/entry) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -62945,7 +62689,7 @@ "cJs" = ( /obj/structure/closet/secure_closet/medical3, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -62953,8 +62697,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{ @@ -62963,7 +62706,7 @@ /area/medical/medbay2) "cJu" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ @@ -62989,8 +62732,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, @@ -63053,8 +62795,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -63097,9 +62838,13 @@ /turf/simulated/floor/plating, /area/maintenance/port) "cJL" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "brown" + }, /area/hallway/secondary/entry) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -63187,7 +62932,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) @@ -63364,7 +63109,6 @@ }, /area/hallway/primary/aft) "cKA" = ( -/obj/item/paicard, /obj/structure/chair/sofa/corp/right, /obj/effect/landmark/start{ name = "Civilian" @@ -63376,8 +63120,7 @@ /area/medical/research) "cKB" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/chair/sofa/corp, /turf/simulated/floor/plasteel{ @@ -63540,7 +63283,6 @@ "cKX" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/storage/firstaid/regular, @@ -63742,7 +63484,7 @@ "cLo" = ( /obj/structure/dresser, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -63753,14 +63495,14 @@ "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) "cLr" = ( /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/machinery/cryopod, @@ -63909,8 +63651,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, @@ -64058,12 +63799,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; @@ -64119,12 +63858,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; @@ -64238,6 +63975,9 @@ "cMv" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64341,7 +64081,7 @@ /obj/item/storage/briefcase, /obj/item/cane, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep) @@ -64475,8 +64215,7 @@ /area/toxins/xenobiology) "cNj" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/effect/decal/cleanable/blood/xeno, /turf/simulated/floor/plasteel{ @@ -64497,8 +64236,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{ @@ -64721,9 +64460,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 }, @@ -64929,8 +64666,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/junction{ dir = 1; @@ -65034,11 +64770,11 @@ "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) @@ -65159,7 +64895,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -65315,17 +65051,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, @@ -65347,8 +65080,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" @@ -65392,8 +65124,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{ @@ -65417,8 +65149,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{ @@ -65448,17 +65180,10 @@ /turf/simulated/wall, /area/toxins/xenobiology) "cPa" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 22 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "brown" }, -/area/toxins/xenobiology) +/area/hallway/secondary/entry) "cPb" = ( /obj/structure/table/reinforced, /obj/item/storage/box/beakers, @@ -65850,7 +65575,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plating, /area/medical/medbay3) @@ -65977,8 +65702,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cQs" = ( -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/analyzer, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, /area/hallway/secondary/entry) "cQu" = ( /obj/effect/decal/warning_stripes/yellow, @@ -65987,13 +65716,6 @@ icon_state = "neutral" }, /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) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -66137,7 +65859,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) @@ -66204,8 +65926,7 @@ "cQO" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66321,8 +66042,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/item/radio/intercom{ pixel_y = 28 @@ -66405,8 +66125,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 @@ -66426,7 +66145,6 @@ /area/medical/psych) "cRr" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, @@ -67043,8 +66761,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 @@ -67091,8 +66808,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 @@ -67534,12 +67250,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, @@ -67626,6 +67340,7 @@ /area/toxins/misc_lab) "cTL" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/machinery/camera{ @@ -67714,7 +67429,7 @@ /area/hallway/primary/aft) "cTW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -67855,7 +67570,7 @@ pixel_y = 5 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -67864,8 +67579,7 @@ /area/medical/medbay3) "cUk" = ( /obj/item/radio/intercom{ - dir = 1; - pixel_y = 25 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -67957,12 +67671,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) @@ -68209,7 +67921,6 @@ /area/shuttle/pod_2) "cUQ" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -68386,8 +68097,7 @@ "cVl" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -1 + pixel_x = 26 }, /obj/machinery/chem_master, /turf/simulated/floor/engine, @@ -68395,6 +68105,7 @@ "cVm" = ( /obj/machinery/smartfridge/secure/extract, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -68454,8 +68165,7 @@ pixel_y = 32 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68495,7 +68205,7 @@ /obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -68539,7 +68249,7 @@ pixel_y = -3 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -68675,8 +68385,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" @@ -68700,7 +68409,7 @@ /area/medical/medbay3) "cVW" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68723,8 +68432,7 @@ "cWb" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/disposalpipe/junction{ dir = 4 @@ -69213,9 +68921,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{ @@ -69224,9 +68930,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, @@ -69319,7 +69023,6 @@ /area/medical/medbay3) "cXm" = ( /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/computer/crew{ @@ -69679,7 +69382,6 @@ "cYm" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/item/stack/cable_coil/random, @@ -69704,7 +69406,7 @@ /area/toxins/lab) "cYo" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -32 + pixel_y = -28 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -69873,8 +69575,7 @@ /area/medical/psych) "cYR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/status_display{ pixel_y = 32 @@ -69915,7 +69616,7 @@ /area/medical/medbay3) "cYW" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -69957,7 +69658,7 @@ "cZa" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/machinery/camera{ c_tag = "Medbay Break Room"; @@ -70311,7 +70012,7 @@ /area/medical/medbay) "cZJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -70393,8 +70094,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, @@ -70505,8 +70205,7 @@ /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 @@ -70671,8 +70370,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -70686,14 +70384,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, @@ -70718,14 +70414,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; @@ -70749,8 +70443,7 @@ /area/medical/research) "daF" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -70882,8 +70575,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -71138,7 +70830,7 @@ /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) @@ -71218,11 +70910,11 @@ 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" @@ -71491,8 +71183,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; @@ -71636,8 +71327,7 @@ 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 @@ -71752,13 +71442,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; @@ -72010,7 +71698,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/cell_charger, /obj/machinery/light, @@ -72071,8 +71759,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 @@ -72218,7 +71905,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, @@ -72355,9 +72042,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{ @@ -72376,8 +72061,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; @@ -72428,7 +72113,7 @@ /obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -72469,8 +72154,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{ @@ -72480,7 +72164,7 @@ "ddZ" = ( /obj/machinery/chem_master, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /obj/structure/sign/nosmoking_2{ pixel_x = -32; @@ -72549,8 +72233,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -72891,7 +72574,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; @@ -72930,29 +72613,6 @@ icon_state = "wood-broken" }, /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) -"deW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/apmaint) "deX" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -72985,8 +72645,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" @@ -73090,7 +72749,7 @@ /area/crew_quarters/hor) "dfm" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -73200,7 +72859,7 @@ }, /obj/machinery/iv_drip, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -73436,8 +73095,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, @@ -73469,7 +73127,7 @@ "dgk" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -73528,7 +73186,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, @@ -73567,7 +73225,7 @@ /obj/structure/table/reinforced, /obj/item/paicard, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -73595,7 +73253,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{ @@ -73701,7 +73359,7 @@ pixel_x = 24 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -73722,8 +73380,7 @@ /area/medical/genetics_cloning) "dgJ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -73897,7 +73554,7 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74067,7 +73724,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{ @@ -74172,12 +73828,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; @@ -74261,8 +73915,7 @@ /area/toxins/explab) "dhN" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/displaycase/labcage, /obj/effect/decal/warning_stripes/yellow, @@ -74420,8 +74073,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 @@ -74545,7 +74197,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/machinery/alarm{ @@ -74707,8 +74358,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 @@ -74828,7 +74478,7 @@ /area/medical/medbay) "diM" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -75015,8 +74665,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 @@ -75248,6 +74897,7 @@ pixel_x = -24 }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -75277,8 +74927,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = null + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -75397,12 +75046,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; @@ -75460,12 +75107,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) @@ -75510,8 +75155,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -75578,8 +75222,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{ @@ -75642,7 +75285,7 @@ "dkm" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /obj/item/stack/packageWrap, /obj/item/stack/sheet/metal{ @@ -75675,8 +75318,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, @@ -75903,12 +75545,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" @@ -75969,12 +75609,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{ @@ -76010,8 +75648,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 @@ -76074,7 +75712,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -76136,8 +75773,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76254,8 +75890,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 @@ -76361,8 +75996,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{ @@ -76496,7 +76130,6 @@ /area/assembly/chargebay) "dmh" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -76605,8 +76238,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76645,8 +76277,7 @@ "dmC" = ( /obj/machinery/vending/medical, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -76690,8 +76321,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{ @@ -76734,8 +76364,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -76772,6 +76401,7 @@ "dmR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -76841,18 +76471,6 @@ icon_state = "neutral" }, /area/maintenance/port) -"dna" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/port) "dnc" = ( /obj/machinery/r_n_d/experimentor, /turf/simulated/floor/engine, @@ -76915,8 +76533,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" @@ -77140,7 +76757,6 @@ "dnL" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/item/storage/box/disks{ @@ -77168,8 +76784,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, @@ -77216,7 +76831,7 @@ "dnU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77274,12 +76889,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" @@ -77288,7 +76901,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, @@ -77349,8 +76962,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 @@ -77373,8 +76985,7 @@ "dok" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -1 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77489,8 +77100,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{ @@ -77515,8 +77126,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -77576,12 +77186,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 }, @@ -77655,7 +77259,7 @@ "doN" = ( /obj/machinery/keycard_auth{ pixel_x = 38; - pixel_y = -26 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" @@ -77667,7 +77271,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -77767,8 +77371,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{ @@ -77822,7 +77427,7 @@ /obj/structure/closet/paramedic, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -77900,12 +77505,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; @@ -78146,7 +77749,7 @@ "dpK" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -78205,7 +77808,6 @@ /obj/structure/table/reinforced, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -78214,7 +77816,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -78330,7 +77932,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, @@ -78356,7 +77958,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, @@ -78367,7 +77969,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -78757,6 +78359,7 @@ /area/maintenance/gambling_den) "drg" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -78973,8 +78576,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{ @@ -79221,7 +78823,6 @@ /area/medical/cmo) "dsi" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -79256,8 +78857,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, @@ -79332,8 +78932,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" @@ -79437,7 +79036,7 @@ "dsJ" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/requests_console{ department = "Robotics"; @@ -79487,8 +79086,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, @@ -79538,9 +79136,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" @@ -79616,7 +79212,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -79626,7 +79222,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, @@ -79919,8 +79515,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 @@ -79944,31 +79539,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction) -"dtF" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/item/radio/intercom{ - pixel_y = 28 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) -"dtG" = ( -/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) "dtH" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -80008,7 +79578,6 @@ /obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plating, @@ -80069,8 +79638,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, @@ -80082,7 +79650,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; @@ -80107,7 +79675,7 @@ icon_state = "1-4" }, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80127,12 +79695,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" @@ -80160,8 +79727,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, @@ -80206,8 +79773,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 4 + pixel_x = -26 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -80294,12 +79860,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; @@ -80391,8 +79955,7 @@ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 27; - pixel_y = 5 + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -80436,8 +79999,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, @@ -80481,29 +80043,13 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/maintenance/starboard) -"duO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) "duP" = ( /obj/machinery/camera{ c_tag = "Engine Room South"; @@ -80664,7 +80210,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -80787,8 +80332,7 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = -4; - pixel_y = 27 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80867,7 +80411,7 @@ department = "Chief Medical Officer's Office" }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80894,12 +80438,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; @@ -80939,8 +80484,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"; @@ -81133,8 +80678,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, @@ -81213,8 +80757,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, @@ -81240,12 +80784,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; @@ -81398,7 +80940,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{ @@ -81480,7 +81021,7 @@ /area/crew_quarters/theatre) "dwT" = ( /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) @@ -81538,8 +81079,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{ @@ -81581,8 +81122,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{ @@ -81597,7 +81137,7 @@ }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81675,7 +81215,6 @@ "dxo" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -81687,8 +81226,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, @@ -82098,13 +81636,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; @@ -82168,12 +81704,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" @@ -82253,11 +81787,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" @@ -82269,7 +81802,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -82277,8 +81810,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -82333,8 +81865,8 @@ dir = 9 }, /obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = -4 + dir = 8; + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -82560,25 +82092,10 @@ icon_state = "white" }, /area/assembly/robotics) -"dyT" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/maintenance/auxsolarstarboard) "dyU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -82727,6 +82244,7 @@ /area/medical/medbay) "dzq" = ( /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /turf/simulated/floor/wood, @@ -82874,6 +82392,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -82882,8 +82401,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82895,8 +82413,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{ @@ -82983,7 +82501,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, @@ -83101,7 +82619,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/item/cartridge/signal/toxins{ pixel_x = -6 @@ -83125,8 +82643,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{ @@ -83191,7 +82708,7 @@ name = "Robotics Operating Computer" }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83329,7 +82846,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -83368,12 +82885,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" @@ -83434,8 +82949,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{ @@ -83563,7 +83077,7 @@ "dAM" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -83605,7 +83119,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, @@ -83680,9 +83194,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, @@ -83780,7 +83292,7 @@ "dBj" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/cable{ d1 = 1; @@ -83813,13 +83325,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{ @@ -83998,8 +83512,7 @@ /area/hallway/primary/aft) "dBR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -84188,11 +83701,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" @@ -84234,7 +83746,7 @@ /obj/item/surgicaldrill, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -84390,7 +83902,7 @@ pixel_x = -1 }, /obj/structure/urinal{ - pixel_y = 27 + pixel_y = 28 }, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) @@ -84487,7 +83999,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" @@ -85296,7 +84808,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -85367,7 +84878,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -85383,9 +84894,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" }, @@ -85592,8 +85104,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -85762,9 +85273,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, @@ -85805,14 +85314,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 @@ -85843,8 +85350,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{ @@ -85879,7 +85385,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; @@ -85898,8 +85404,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{ @@ -86073,6 +85578,7 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /turf/simulated/floor/plasteel{ @@ -86083,8 +85589,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -86105,21 +85610,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"; @@ -86143,8 +85638,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/airlock/access_controller{ id_tag = "viro_lab_airlock_control"; @@ -86166,14 +85660,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 @@ -86192,14 +85684,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/medical/virology) @@ -86207,8 +85697,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; @@ -86221,8 +85710,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86233,14 +85721,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, @@ -86282,7 +85768,7 @@ /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" @@ -86292,8 +85778,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/bed, /obj/item/bedsheet/medical, @@ -86307,7 +85792,6 @@ "dHq" = ( /obj/structure/table/glass, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -86483,8 +85967,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{ @@ -86555,13 +86038,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, @@ -86673,7 +86154,7 @@ "dId" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86684,8 +86165,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -86693,12 +86173,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" @@ -86760,8 +86238,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 @@ -86778,8 +86255,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"; @@ -86797,8 +86273,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 @@ -86820,8 +86295,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 @@ -87007,13 +86481,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" @@ -87023,8 +86495,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; @@ -87043,8 +86514,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 @@ -87059,8 +86529,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -87070,8 +86539,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 @@ -87087,8 +86555,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{ @@ -87117,8 +86584,8 @@ /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; @@ -87129,8 +86596,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87296,7 +86762,7 @@ sortType = 17 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -87362,7 +86828,7 @@ /area/medical/surgery) "dJP" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -87373,8 +86839,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, @@ -87388,7 +86853,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -87410,8 +86875,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ @@ -87442,8 +86906,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87488,7 +86951,7 @@ "dKd" = ( /obj/structure/table, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87501,7 +86964,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -87524,8 +86987,7 @@ "dKg" = ( /obj/structure/bookcase, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87561,7 +87023,7 @@ "dKk" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87571,7 +87033,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" @@ -87620,8 +87082,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; @@ -87790,12 +87251,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{ @@ -87818,8 +87277,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -87857,23 +87315,31 @@ "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, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /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" }, @@ -87883,6 +87349,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dLd" = ( @@ -87906,8 +87375,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -87920,7 +87388,6 @@ /area/medical/virology) "dLg" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -88016,7 +87483,6 @@ "dLp" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -88061,15 +87527,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" @@ -88260,8 +87724,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{ @@ -88291,8 +87754,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{ @@ -88303,8 +87765,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -88324,8 +87785,7 @@ "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, @@ -88415,8 +87875,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, @@ -88458,8 +87917,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88469,8 +87927,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, @@ -88483,8 +87940,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88499,8 +87955,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88510,8 +87965,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -88525,8 +87979,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88559,14 +88012,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; @@ -88595,8 +88046,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 @@ -88617,8 +88067,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -88626,12 +88075,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" @@ -88641,8 +88088,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, @@ -88835,8 +88281,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, @@ -88868,8 +88313,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -88915,8 +88359,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, @@ -88939,7 +88382,6 @@ pixel_y = 24 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -89021,7 +88463,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" @@ -89097,8 +88539,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{ @@ -89116,8 +88557,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{ @@ -89169,16 +88609,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" @@ -89188,8 +88625,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 @@ -89206,8 +88642,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/medical{ name = "Virology"; @@ -89225,14 +88660,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 @@ -89249,8 +88682,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 @@ -89266,8 +88698,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -89288,12 +88719,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 @@ -89306,14 +88735,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, @@ -89388,7 +88815,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -89442,7 +88869,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "dOE" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -89450,17 +88876,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; @@ -89484,8 +88909,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, @@ -89497,8 +88921,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/sink{ dir = 8; @@ -89521,7 +88944,7 @@ /obj/machinery/iv_drip, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" @@ -89539,8 +88962,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/table/glass, /obj/item/paper_bin, @@ -89549,7 +88971,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -89566,14 +88988,6 @@ icon_state = "neutral" }, /area/maintenance/apmaint) -"dOQ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/apmaint) "dOR" = ( /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plasteel{ @@ -89681,16 +89095,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 @@ -89747,8 +89159,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{ @@ -89760,8 +89171,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, @@ -89770,8 +89180,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, @@ -89789,14 +89198,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 @@ -89809,26 +89216,11 @@ icon_state = "blue" }, /area/maintenance/apmaint) -"dPw" = ( -/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 - }, -/turf/simulated/floor/plating, -/area/maintenance/apmaint) "dPx" = ( /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 @@ -89845,8 +89237,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{ @@ -89864,18 +89255,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 @@ -89886,14 +89274,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{ @@ -89911,8 +89297,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 @@ -89943,7 +89328,6 @@ /area/maintenance/apmaint) "dPD" = ( /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -89957,15 +89341,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{ @@ -90132,8 +89514,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{ @@ -90159,8 +89540,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 4 @@ -90281,8 +89661,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/medical/virology) @@ -90293,8 +89672,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{ @@ -90407,16 +89785,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) @@ -90437,8 +89813,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -90454,8 +89829,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; @@ -90499,8 +89873,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ frequency = 1379; @@ -90517,8 +89890,7 @@ "dQP" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -90526,14 +89898,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 @@ -90555,8 +89925,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) @@ -90578,13 +89948,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" @@ -90595,7 +89963,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -90638,8 +90006,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -90652,8 +90019,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"; @@ -90679,8 +90045,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, @@ -90711,8 +90076,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{ @@ -90728,8 +90092,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, @@ -90800,7 +90163,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" @@ -90810,24 +90173,12 @@ /obj/structure/morgue, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) -"dRu" = ( -/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{ - icon_state = "dark" - }, -/area/chapel/office) "dRv" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -90868,8 +90219,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" @@ -90884,8 +90236,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, @@ -90913,8 +90264,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{ @@ -90957,8 +90307,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/door/morgue{ name = "Chapel Morgue"; @@ -91040,8 +90389,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, @@ -91053,8 +90401,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, @@ -91074,8 +90421,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, @@ -91089,7 +90435,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91101,7 +90447,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91123,8 +90469,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{ @@ -91141,8 +90486,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 @@ -91272,8 +90617,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, @@ -91282,14 +90626,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, @@ -91298,8 +90640,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, @@ -91309,13 +90650,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{ @@ -91345,8 +90685,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, @@ -91407,8 +90746,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, @@ -91417,8 +90755,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) @@ -91465,14 +90802,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, @@ -91522,7 +90857,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{ @@ -91540,8 +90874,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" @@ -91553,8 +90886,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -91578,7 +90910,7 @@ /obj/structure/table/wood, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/status_display{ pixel_y = 32 @@ -91597,8 +90929,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" @@ -91632,8 +90964,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 @@ -91658,8 +90989,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -91678,6 +91008,8 @@ 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" }, @@ -91705,14 +91037,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) @@ -91877,8 +91207,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, @@ -91908,8 +91237,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, @@ -92030,14 +91358,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; @@ -92109,7 +91435,7 @@ /area/engine/engineering) "dUJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/dresser, /turf/simulated/floor/plasteel{ @@ -92152,8 +91478,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{ @@ -92165,8 +91491,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" @@ -92191,7 +91517,7 @@ }, /obj/item/storage/fancy/candle_box/full, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/carpet, /area/chapel/office) @@ -92284,8 +91610,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, @@ -92310,8 +91635,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -92557,8 +91881,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{ @@ -92570,8 +91894,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, @@ -92598,7 +91922,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" @@ -92611,7 +91935,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{ @@ -92714,8 +92038,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, @@ -92797,7 +92120,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{ @@ -92910,7 +92233,6 @@ /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, @@ -92933,8 +92255,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -92999,8 +92320,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{ @@ -93082,7 +92402,7 @@ pixel_y = -22 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93126,7 +92446,6 @@ /area/maintenance/apmaint) "dXz" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/camera{ @@ -93202,8 +92521,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" @@ -93245,8 +92563,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{ @@ -93298,8 +92616,7 @@ /area/chapel/office) "dXW" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 8 + dir = 4 }, /obj/machinery/access_button{ command = "cycle_interior"; @@ -93356,7 +92673,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; @@ -93371,7 +92688,7 @@ }, /obj/item/storage/box/masks, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -93534,14 +92851,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; @@ -93618,14 +92933,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, @@ -93634,14 +92947,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; @@ -93663,8 +92974,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -93683,8 +92993,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -93746,7 +93055,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" @@ -94042,8 +93351,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -94138,8 +93446,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/biogenerator, /turf/simulated/floor/plasteel, @@ -94367,14 +93674,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) @@ -94527,7 +93836,6 @@ /obj/item/restraints/handcuffs, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -94673,8 +93981,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, @@ -94758,7 +94065,7 @@ "gzU" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -94957,7 +94264,7 @@ /obj/structure/chair/stool, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plating, /area/security/permabrig) @@ -95059,8 +94366,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 @@ -95173,7 +94479,6 @@ network = list("Medical","SS13") }, /obj/machinery/status_display{ - layer = 4; pixel_y = -32 }, /obj/item/reagent_containers/spray/cleaner{ @@ -95427,8 +94732,7 @@ 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 @@ -95444,7 +94748,7 @@ "iIw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95458,15 +94762,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"; @@ -95659,7 +94963,7 @@ "jqB" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -95676,8 +94980,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -95800,8 +95103,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -95912,7 +95214,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, @@ -95946,11 +95248,11 @@ "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, /turf/simulated/floor/plasteel{ @@ -95996,8 +95298,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/port) @@ -96135,18 +95436,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{ @@ -96478,8 +95767,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, @@ -96615,7 +95903,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -96630,8 +95918,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -96666,8 +95953,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{ @@ -96679,8 +95965,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -96861,7 +96146,7 @@ /area/hallway/secondary/entry) "mYH" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97036,7 +96321,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97053,7 +96338,7 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97138,7 +96423,7 @@ /obj/machinery/recharger, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -97220,7 +96505,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{ @@ -97232,8 +96517,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/lattice/catwalk, /turf/space, @@ -97283,7 +96567,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel, /area/security/permabrig) @@ -97455,8 +96739,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{ @@ -97465,8 +96748,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -97537,10 +96819,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{ @@ -97590,12 +96868,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" @@ -97879,8 +97155,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/apmaint) @@ -97899,8 +97174,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/machinery/door/poddoor{ density = 0; @@ -97942,8 +97216,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -98189,8 +97462,7 @@ "rje" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -4 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -98265,7 +97537,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; @@ -98304,8 +97576,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, @@ -98346,7 +97617,7 @@ "rHU" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98478,20 +97749,17 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -98547,8 +97815,7 @@ "shi" = ( /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /obj/machinery/door/poddoor{ density = 0; @@ -98662,7 +97929,7 @@ "suy" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /obj/machinery/camera{ @@ -98813,7 +98080,7 @@ "sVr" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -99020,7 +98287,7 @@ icon_state = "4-8" }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -99122,7 +98389,6 @@ /area/medical/research) "tNq" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -99257,8 +98523,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) @@ -99376,7 +98641,6 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -99827,8 +99091,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -99915,7 +99178,6 @@ /area/hallway/secondary/exit) "vUu" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/structure/chair/comfy/shuttle{ @@ -100114,8 +99376,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/lattice/catwalk, /turf/space, @@ -100209,8 +99470,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, @@ -100250,8 +99510,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 @@ -100379,20 +99638,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{ @@ -113534,7 +112783,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bku bmq @@ -113791,7 +113040,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bku bmq @@ -114048,7 +113297,7 @@ aaa aaa aaa aaa -bUJ +nZa abj bPS bRM @@ -114305,7 +113554,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bPT bRN @@ -114562,7 +113811,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bPU bRO @@ -114819,7 +114068,7 @@ aaa aaa aaa aaa -bUJ +nZa abj bPV abj @@ -115076,7 +114325,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bPW bRP @@ -115333,7 +114582,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa bPX bRQ @@ -115590,7 +114839,7 @@ aaa aaa aaa aaa -bUJ +nZa aaa abj bRR @@ -115848,7 +115097,7 @@ aaa aaa aaa bVf -bXG +wRP bYl abj coi @@ -116106,7 +115355,7 @@ aaa aaa abj aaa -bUJ +nZa aaa csr aaa @@ -116363,7 +115612,7 @@ aaa aaa abj aaa -bUJ +nZa aaa csr aaa @@ -116620,7 +115869,7 @@ aaa aaa abj abj -bUJ +nZa abj coi abj @@ -116877,7 +116126,7 @@ aaa aaa abj aaa -bUJ +nZa aaa csr aaa @@ -117134,7 +116383,7 @@ aaa aaa abj aaa -bUJ +nZa aaa csr aaa @@ -119478,9 +118727,9 @@ cHA sPz cXU cHA -bya -pfE -pfE +cHA +cJK +cJK cHA cHA aaa @@ -120002,7 +119251,7 @@ aaa abj seE bPS -vXX +aaa aaa aaa aaa @@ -120259,7 +119508,7 @@ aaa cHA kdR cHA -vXX +aaa aaa aaa aaa @@ -120773,7 +120022,7 @@ aaa cHA fxr cHA -vXX +aaa aaa aaa aaa @@ -126166,7 +125415,7 @@ cOM cLP cRN cTo -cAS +kpI cWx cYf cLP @@ -129236,10 +128485,10 @@ cvb cly cly czt -cAS +kpI cCw cly -cAS +kpI cGk dmq cIL @@ -129518,8 +128767,8 @@ deP dfZ dhH djk -cAS -cAS +kpI +kpI vGB doA kpI @@ -131025,18 +130274,18 @@ cNh drn cke cly -dna +vGB cly cHs cHs -cAS +kpI cly cvg cwD -cAS +kpI czx -cAS -cAS +kpI +kpI cDR cly cGn @@ -131580,7 +130829,7 @@ mTO jVL dkI vGz -cAS +kpI ydp drn dvV @@ -133131,7 +132380,7 @@ dyA dzG dAT dWo -dOQ +qfH dDY dOO dFl @@ -133400,11 +132649,11 @@ dOO dEi dKH dLn -deW -dOQ +qxp +qfH dgm dOn -dOQ +qfH dPC dbw dQS @@ -133615,7 +132864,7 @@ cIO cIO cIO cIL -cPa +cQP cPe cQU cSg @@ -133649,7 +132898,7 @@ dCJ dDZ dEJ dEJ -dOQ +qfH dGJ dHz ddx @@ -134689,7 +133938,7 @@ dMh dMS dNI dOp -dRu +gsy dPE dQi dQU @@ -135964,7 +135213,7 @@ ddy ddy ddy ddy -dPw +xoq dID dJx dKi @@ -141720,14 +140969,14 @@ aaa aaa aaa aaa -abj -abj -abj aaa -abj +aaa aaa aaa abj +abj +aaa +aaa aaa acC afb @@ -141975,17 +141224,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 @@ -142232,27 +141481,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 @@ -142489,27 +141738,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 @@ -142746,26 +141995,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 -afN -agn -agH -aiT -aiT -aiT -aiT -aiT -aiT -aiT -akb -aiT +aeb +aeb +afK +agB fuR aiT alK @@ -143003,28 +142252,28 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +adb +adb +adb +aeM +adb +adb +adb +adb adb -aeK cFP -aeK adb -adb -adb -adb -afa -adb -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN -adN axm axm awY @@ -143260,28 +142509,28 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa adb -cFN +aeC +aeN +aff +adb +afk +afz +agp cGw -cFN -adb -aeL -afd -afx -afP -ago -adN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cJL akB alJ alZ @@ -143518,27 +142767,27 @@ aaa aaa aaa aaa -cFN -cHe -cFN +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 +cHe +cPa akB alX ama @@ -143775,27 +143024,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 +cIu +cQs akB auu amb @@ -144035,24 +143284,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 @@ -144290,26 +143539,26 @@ aaa aaa aaa aaa -dij +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeL +afe +aeL +afg +afn +afN +akb +afg abj -aeB -dtF -duO -dGZ -aeB -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alN amd @@ -144547,25 +143796,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 +bya +afg aaa akB alO @@ -144800,30 +144049,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 +cFN +afg abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa akB alP ajI @@ -145063,24 +144312,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 @@ -145320,24 +144569,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 @@ -145578,23 +144827,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 @@ -145825,6 +145074,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -145836,22 +145097,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 @@ -146078,6 +145327,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -146093,22 +145354,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 @@ -146335,37 +145584,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 @@ -146592,37 +145841,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 @@ -146849,22 +146098,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 @@ -146873,18 +146134,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm aoi dZP @@ -147106,22 +146355,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 @@ -147130,18 +146391,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZP dZR @@ -147363,22 +146612,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 @@ -147387,18 +146648,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZO dZQ @@ -147617,37 +146866,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 @@ -147874,13 +147123,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 @@ -147888,27 +147149,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 @@ -148048,7 +147297,7 @@ dFG aaa dQH dNW -deV +dRf dMy dNl dRi @@ -148131,25 +147380,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 @@ -148163,18 +147424,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asR @@ -148388,13 +147637,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 @@ -148402,7 +147663,7 @@ acF aaa aaa aaa -aci +acj abj abj abj @@ -148420,18 +147681,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asS @@ -148645,22 +147894,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 @@ -148677,18 +147938,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asT @@ -148905,33 +148154,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 @@ -149162,19 +148411,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 @@ -149190,18 +148451,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa abj @@ -149419,33 +148668,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 @@ -149676,19 +148925,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 @@ -149716,18 +148977,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa acF acF acF @@ -149933,15 +149182,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 @@ -149976,18 +149237,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -150190,6 +149439,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150223,18 +149484,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaZ aaa aaa @@ -150451,6 +149700,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150487,18 +149748,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj abj abj From d7d9cd648de3748e8fc8c9a078c5c8549ebc0cfa Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Tue, 12 Oct 2021 19:14:38 +0100 Subject: [PATCH 09/21] removes 2 extra APCs from engineering foyer --- _maps/map_files/Delta/delta.dmm | 63 ++------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index bbca737c442..87495020389 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -38634,20 +38634,6 @@ icon_state = "vault" }, /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 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/break_room) "bKb" = ( /obj/structure/cable{ d1 = 1; @@ -39566,11 +39552,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 @@ -40603,15 +40584,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" @@ -42643,17 +42615,6 @@ icon_state = "neutralfull" }, /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" - }, -/area/engine/break_room) "bSl" = ( /obj/item/storage/box/donkpockets, /obj/structure/table, @@ -43809,11 +43770,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 }, @@ -44816,11 +44772,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" @@ -46130,11 +46081,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) @@ -51397,11 +51343,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"; @@ -121777,7 +121718,7 @@ bDi bEL bzL bwN -bKa +bNX bMd bNW bUP @@ -127178,7 +127119,7 @@ bKr bMw bQs bOn -bSk +bQt bUv bWu clo From eee606310b0ea332a4a88b3e14f410cc95c264e5 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 15 Oct 2021 20:55:31 +0100 Subject: [PATCH 10/21] traders dont delete arrivals, message monitoring consoles --- _maps/map_files/Delta/delta.dmm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 87495020389..9da806c7f57 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -49762,6 +49762,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/computer/message_monitor{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -64347,7 +64350,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"; @@ -73164,11 +73166,12 @@ pixel_x = -24 }, /obj/structure/table/reinforced, -/obj/item/paicard, /obj/structure/extinguisher_cabinet{ pixel_y = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73867,10 +73870,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" }, @@ -76044,6 +76047,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" }, @@ -97077,6 +97081,7 @@ /area/security/permasolitary) "qcA" = ( /obj/docking_port/stationary{ + dir = 8; dwidth = 4; height = 11; id = "trade_dock"; From 491a2a2521faf006bc2cf20bc3beaee90ba99e29 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 15 Oct 2021 21:33:16 +0100 Subject: [PATCH 11/21] deconflicted --- _maps/map_files/Delta/delta.dmm | 6239 +++++++++++++------------------ 1 file changed, 2654 insertions(+), 3585 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 49340e999c9..43a280d5197 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"; @@ -358,7 +367,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 +392,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 +425,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 +447,26 @@ /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" + }, +/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 +479,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 +585,7 @@ icon_state = "brown" }, /area/hallway/secondary/entry) -"afe" = ( +"afB" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -502,7 +599,7 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry) -"aff" = ( +"afC" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -516,7 +613,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 +635,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 +671,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 +697,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 +715,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 +745,6 @@ /area/hallway/secondary/entry) "agg" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -844,7 +755,6 @@ /area/hallway/secondary/entry) "agh" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -866,57 +776,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 +892,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 +1197,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 +1276,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 +1375,6 @@ /area/hallway/secondary/entry) "alu" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/camera{ @@ -1483,7 +1406,6 @@ /area/hallway/secondary/entry) "aly" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1508,7 +1430,6 @@ /area/space) "alG" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = -32 }, /obj/machinery/light{ @@ -1532,7 +1453,6 @@ /area/maintenance/fore2) "alK" = ( /obj/machinery/status_display{ - layer = 4; pixel_x = 32 }, /obj/machinery/light{ @@ -1542,8 +1462,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 +1517,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 +1608,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 +1900,7 @@ dir = 1 }, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2210,7 +2128,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 +2189,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 +2207,7 @@ pixel_y = 25 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -2523,7 +2441,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 +2461,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 +2480,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 +2545,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 +2583,7 @@ "apl" = ( /obj/structure/filingcabinet, /obj/machinery/firealarm{ - pixel_y = 32 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -3273,7 +3191,7 @@ /area/maintenance/fore) "aqI" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -3854,7 +3772,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/computer/security{ @@ -4276,14 +4193,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 +4252,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 +4285,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 +4293,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 +4390,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 +4408,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 +4489,7 @@ "atB" = ( /obj/structure/filingcabinet, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -4602,7 +4514,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 +4586,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4776,8 +4687,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -4911,7 +4821,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 +4889,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) @@ -6553,8 +6463,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6572,8 +6481,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6591,8 +6499,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{ @@ -6609,8 +6516,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ @@ -6629,8 +6535,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -6728,8 +6633,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 +6810,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 +6871,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 @@ -7338,7 +7242,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 +7392,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 +7455,7 @@ /area/quartermaster/storage) "azJ" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7592,7 +7495,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 +7511,7 @@ /area/quartermaster/storage) "azP" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ @@ -8427,6 +8329,7 @@ icon_state = "1-8" }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /obj/item/reagent_containers/glass/bucket, @@ -8759,8 +8662,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 @@ -8834,7 +8736,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 +9187,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 +9227,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; @@ -9712,6 +9614,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 +9632,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 +9659,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 +9681,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; @@ -9841,16 +9736,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) @@ -10183,6 +10068,11 @@ }, /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" @@ -10227,11 +10117,6 @@ /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 +10191,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 +10265,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 +10394,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 +10495,7 @@ "aGn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) @@ -10624,7 +10504,7 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -10681,8 +10561,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -26; - pixel_y = 28 + pixel_x = -26 }, /obj/machinery/bottler, /turf/simulated/floor/plasteel{ @@ -10738,7 +10617,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 +10634,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 +10644,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" @@ -10930,24 +10813,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; @@ -11241,11 +11122,6 @@ /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; @@ -11346,7 +11222,7 @@ "aHR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -11360,17 +11236,12 @@ 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" @@ -11393,15 +11264,6 @@ }, /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) "aHX" = ( /obj/structure/cable{ d1 = 4; @@ -11450,11 +11312,10 @@ /area/quartermaster/storage) "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{ @@ -11465,7 +11326,7 @@ "aIc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -11480,7 +11341,8 @@ "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 +11375,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, @@ -11578,8 +11440,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 +11537,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 +11555,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 +11645,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -11915,7 +11774,17 @@ /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; @@ -11948,17 +11817,10 @@ /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" @@ -12246,8 +12108,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 +12281,7 @@ icon_state = "0-2" }, /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -12446,7 +12306,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 +12438,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 +12445,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" @@ -12632,11 +12487,15 @@ /area/crew_quarters/sleep) "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" @@ -12689,7 +12548,7 @@ "aKr" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ - c_tag = "Bar"; + c_tag = "Bar North"; dir = 4; pixel_y = -22 }, @@ -12735,8 +12594,7 @@ /area/hallway/primary/fore) "aKv" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -13155,7 +13013,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -13205,11 +13063,6 @@ }, /area/maintenance/fore) "aLD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light/small{ dir = 4 }, @@ -13221,7 +13074,7 @@ "aLE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -13268,6 +13121,11 @@ /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" @@ -13283,8 +13141,7 @@ pixel_x = -24 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -13437,12 +13294,10 @@ /area/quartermaster/office) "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; @@ -13613,7 +13468,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, @@ -13715,7 +13570,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 +13655,7 @@ pixel_x = 32 }, /obj/item/radio/intercom{ - dir = 1; - pixel_y = -25 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13873,6 +13727,11 @@ }, /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" @@ -13880,11 +13739,6 @@ /area/crew_quarters/sleep) "aNg" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -13899,7 +13753,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -14208,7 +14062,6 @@ }, /area/security/permabrig) "aNO" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/storage/box/donkpockets, /turf/simulated/floor/plasteel{ @@ -14317,7 +14170,7 @@ "aNZ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/alarm{ dir = 8; @@ -14583,7 +14436,6 @@ /area/crew_quarters/bar) "aOI" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -14843,8 +14695,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/igniter{ id = "Incinerator"; @@ -14962,12 +14813,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 +14825,7 @@ /area/atmos) "aPz" = ( /obj/item/radio/intercom{ - pixel_y = 22 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15046,8 +14895,7 @@ /area/atmos) "aPG" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -15125,7 +14973,7 @@ }, /obj/structure/closet/secure_closet/clown, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" @@ -15139,7 +14987,7 @@ }, /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" @@ -15398,6 +15246,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 +15274,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 +15286,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/southwestcorner, @@ -15457,6 +15309,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 +15393,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 +15487,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 +15596,7 @@ /area/atmos) "aRa" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -22 + pixel_x = -25 }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/shower{ @@ -15936,37 +15795,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 }, @@ -16059,7 +15900,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,12 +15908,12 @@ 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; @@ -16274,6 +16115,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" @@ -16534,8 +16376,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 +16394,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ + name = "Entertainment Office"; req_access_txt = "46" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16666,11 +16509,6 @@ /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,6 +16516,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -16685,27 +16538,12 @@ /area/crew_quarters/sleep) "aTa" = ( /obj/structure/disposalpipe/junction, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/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" - }, /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" @@ -16797,7 +16635,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Cargo Disposals Sorting"; dir = 1 }, /obj/effect/decal/warning_stripes/east, @@ -16824,11 +16662,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, @@ -16978,7 +16811,6 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -17005,6 +16837,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 +17298,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) @@ -17546,7 +17380,7 @@ /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{ @@ -17563,24 +17397,15 @@ }, /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) @@ -17666,8 +17491,7 @@ pixel_y = 3 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -17720,7 +17544,7 @@ "aUS" = ( /obj/structure/table, /obj/machinery/camera{ - c_tag = "Medbay Lobby East" + c_tag = "Cargo office" }, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -17892,7 +17716,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -17902,8 +17726,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; @@ -18369,11 +18192,6 @@ /area/crew_quarters/theatre) "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; @@ -18728,7 +18546,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 +18707,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -18900,7 +18718,7 @@ dir = 5 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -19172,18 +18990,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,6 +19014,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -19198,16 +19030,6 @@ /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" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -19218,7 +19040,7 @@ /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 +19073,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 +19094,6 @@ /area/atmos) "aXH" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -19727,7 +19547,8 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_x = -22 + dir = 4; + pixel_x = -26 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19755,7 +19576,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 +19691,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 +19735,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 }, +/obj/structure/cable{ + d1 = 1; + 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/crew_quarters/sleep) "aYY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/effect/landmark{ name = "lightsout" }, @@ -19979,7 +19780,7 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Atrium"; + c_tag = "Bar South"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -19992,7 +19793,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -20092,11 +19893,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 +19970,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 +20002,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 +20022,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 +20034,7 @@ pixel_y = -24 }, /obj/machinery/camera{ - c_tag = "Arrivals North"; + c_tag = "Quartermaster Office"; dir = 1 }, /turf/simulated/floor/plasteel{ @@ -20266,12 +20067,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 +20085,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 +20103,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 +20118,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 +20307,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 +20373,6 @@ "aZZ" = ( /obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -20832,11 +20652,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,23 +20680,22 @@ "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, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /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" - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -20935,7 +20749,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 +20796,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 +20880,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 +20974,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 +20981,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 +20995,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 +21005,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 +21027,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 +21120,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 @@ -21438,7 +21216,7 @@ /area/shuttle/pod_3) "bbJ" = ( /obj/item/radio/intercom{ - pixel_y = 25 + pixel_y = 28 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -21606,19 +21384,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 +21405,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 +21431,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,25 +21443,19 @@ 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, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /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" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -21729,8 +21494,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 +21601,6 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -21913,8 +21676,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 +21990,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 +21997,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 +22006,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 +22076,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -22355,9 +22104,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,6 +22115,11 @@ }, /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" @@ -22373,14 +22127,9 @@ /area/crew_quarters/sleep) "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 @@ -22555,7 +22304,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -22856,7 +22604,7 @@ "beL" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ @@ -23027,7 +22775,7 @@ "bfe" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -23073,7 +22821,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 +22925,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 +23101,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{ @@ -23780,8 +23527,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 +23658,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 +23769,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 +23884,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, @@ -24581,8 +24326,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 1; @@ -24705,8 +24449,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 +24504,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/effect/landmark/start{ @@ -25376,7 +25119,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 +25226,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 +25245,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 +25379,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/camera{ c_tag = "Security Interrogation Room"; @@ -25669,7 +25408,7 @@ "bkn" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/computer/secure_data{ dir = 8 @@ -25728,8 +25467,7 @@ "bks" = ( /obj/machinery/photocopier, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -26020,7 +25758,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 +25958,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -26379,18 +26117,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"; @@ -26401,6 +26127,16 @@ network = list("SS13","Security") }, /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 +26146,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 +26309,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 +26322,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 +26356,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -26839,7 +26575,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) @@ -27420,7 +27156,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/east, @@ -27549,7 +27284,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27673,7 +27408,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway North" @@ -27712,7 +27447,7 @@ icon_state = "pipe-c" }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -28110,8 +27845,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -28121,8 +27855,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 +27869,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 +27879,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 +27898,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d2 = 8; @@ -28440,8 +28170,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 +28346,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) @@ -29570,7 +29299,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, @@ -29703,7 +29432,7 @@ "bsr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -29748,27 +29477,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 +29507,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 +29530,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 +29555,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 +29696,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 +30120,6 @@ /area/security/nuke_storage) "btR" = ( /obj/item/radio/intercom{ - pixel_x = -6; pixel_y = -28 }, /obj/effect/decal/warning_stripes/northeast, @@ -30400,16 +30143,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 +30170,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 +30180,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 +30187,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 +30261,7 @@ /area/security/interrogation) "buf" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -30599,7 +30316,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 +30449,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -30754,7 +30471,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 +30794,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 +30801,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 +30871,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -31261,8 +30963,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 +30986,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 +31096,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -31872,17 +31572,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 +31586,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 +31706,7 @@ /area/turret_protected/ai) "bwH" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -32111,7 +31815,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 +31831,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 +31867,7 @@ network = list("SS13","Engineering") }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32249,7 +31953,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 +32055,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 +32233,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 +32241,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonershuttle) "bxM" = ( @@ -32584,7 +32284,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 +32324,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 +32360,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 +32373,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 +32389,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 +32502,7 @@ /area/engine/break_room) "byv" = ( /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -33087,7 +32789,6 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/light{ @@ -33166,7 +32867,6 @@ "byY" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -33483,8 +33183,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 +33207,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 +33222,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 +33424,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 +33647,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 +34075,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 +34101,7 @@ pixel_y = 24 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -34475,7 +34174,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -34682,7 +34381,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 +34417,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 +35001,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35398,7 +35095,6 @@ name = "tripai" }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/radio/intercom/private{ @@ -35442,7 +35138,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 22 + pixel_x = 25 }, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/northeast, @@ -36268,7 +35964,6 @@ pixel_y = -10 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/effect/landmark/start{ @@ -36392,7 +36087,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 +36099,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/alarm{ dir = 1; @@ -36484,7 +36179,7 @@ "bFc" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -36504,16 +36199,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, @@ -36588,7 +36282,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 +36358,7 @@ /area/bridge) "bFx" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -36679,7 +36372,7 @@ /area/bridge) "bFz" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -36836,7 +36529,7 @@ "bFQ" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -37116,7 +36809,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 +36819,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 +37214,7 @@ "bGV" = ( /obj/machinery/vending/assist, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/camera{ c_tag = "Primary Tool Storage"; @@ -37654,7 +37348,7 @@ "bHi" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -37705,6 +37399,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" @@ -37923,7 +37618,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 +37948,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 +37972,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 +37992,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 +38057,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 +38161,6 @@ "bIQ" = ( /obj/machinery/vending/tool, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/yellow, @@ -38536,7 +38228,7 @@ }, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -38553,7 +38245,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 +38318,6 @@ /area/crew_quarters/captain) "bJk" = ( /obj/machinery/light_switch{ - pixel_x = 8; pixel_y = 26 }, /obj/machinery/disposal, @@ -38651,14 +38342,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 +38380,7 @@ dir = 1 }, /obj/machinery/newscaster{ - layer = 3.3; - pixel_y = -27 + pixel_y = -30 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -38919,8 +38608,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 +38715,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 +38739,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/door_control{ id = "transitlock"; @@ -39402,7 +39085,7 @@ /area/bridge/meeting_room) "bKM" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /turf/simulated/floor/wood, @@ -39431,7 +39114,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 +39138,6 @@ /area/turret_protected/ai_upload) "bKV" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /turf/simulated/floor/bluegrid, @@ -39782,7 +39464,7 @@ "bLO" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39959,11 +39641,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 +39745,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 +39776,7 @@ /obj/item/pen, /obj/machinery/light, /obj/machinery/light_switch{ + dir = 1; pixel_y = -26 }, /turf/simulated/floor/plasteel{ @@ -40153,8 +39829,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 +39842,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 +39856,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 +40170,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -40506,7 +40180,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 +40640,7 @@ "bOh" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40999,15 +40673,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 +40694,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 +40715,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 +40734,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 +40747,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 +40875,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 +40960,6 @@ /area/crew_quarters/captain) "bOV" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/wood, @@ -41439,7 +41102,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41659,8 +41322,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 +41394,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 +41455,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -41887,10 +41547,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 +41670,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 +41689,7 @@ /area/crew_quarters/chief) "bQl" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/structure/bed, /obj/item/bedsheet/ce, @@ -42113,7 +41773,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 +41868,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 +41888,6 @@ /area/bridge/meeting_room) "bQF" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/slot_machine, @@ -42452,7 +42110,7 @@ "bRd" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -42637,7 +42295,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43047,16 +42705,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 +42837,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 +42898,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43294,8 +42944,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 +43020,7 @@ /area/hallway/primary/central) "bSW" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43425,7 +43075,6 @@ /area/turret_protected/aisat) "bTd" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/machinery/camera{ @@ -43519,7 +43168,6 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /obj/machinery/light{ @@ -43546,7 +43194,7 @@ /obj/item/flashlight/lamp, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/machinery/light{ dir = 4 @@ -43593,8 +43241,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 +43263,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 +43284,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 +43337,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 +43576,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 +43774,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 +43872,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 +44086,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 +44111,7 @@ /area/crew_quarters/captain) "bUW" = ( /obj/machinery/light_switch{ - pixel_x = -8; + dir = 1; pixel_y = -26 }, /obj/machinery/camera{ @@ -44495,7 +44132,6 @@ /area/crew_quarters/captain) "bUY" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/carpet/black, @@ -44596,8 +44232,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/lattice/catwalk, /turf/space, @@ -44679,8 +44314,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 +44430,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 +44562,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 +44619,7 @@ "bVU" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -45002,7 +44635,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45114,9 +44747,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 +44872,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 +44883,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 +44907,7 @@ }, /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45295,7 +44920,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -45307,8 +44932,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 +45002,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45734,8 +45359,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 +45424,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -45845,7 +45469,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 +45597,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 +45699,6 @@ /area/crew_quarters/captain/bedroom) "bYA" = ( /obj/machinery/light_switch{ - pixel_x = -8; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -46177,6 +45799,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 +45822,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 +46201,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 +46267,6 @@ "bZJ" = ( /obj/structure/table/wood, /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /obj/machinery/computer/library, @@ -46679,7 +46311,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 +46321,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 +46338,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46723,7 +46355,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 +46370,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46788,8 +46419,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) @@ -46868,7 +46502,6 @@ /obj/item/pinpointer, /obj/item/disk/nuclear, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/carpet/black, @@ -46936,7 +46569,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 +46627,7 @@ "caB" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -47012,8 +46645,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 +46668,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 +46710,7 @@ "caK" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/filingcabinet/security, /turf/simulated/floor/wood, @@ -47131,7 +46768,7 @@ "caQ" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ - pixel_y = 26 + pixel_y = 28 }, /obj/machinery/flasher_button{ id = "hopflash"; @@ -47139,8 +46776,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 +46839,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 +47144,7 @@ /area/engine/engineering) "cbx" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /obj/structure/cable/yellow{ d2 = 2; @@ -47530,8 +47167,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 +47181,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 +47249,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47934,7 +47569,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 +47761,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 +48148,7 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "cdI" = ( @@ -48638,7 +48273,7 @@ "cdX" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ @@ -48658,6 +48293,7 @@ dir = 8 }, /obj/machinery/recharger, +/obj/item/megaphone, /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cdZ" = ( @@ -49113,9 +48749,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 +48858,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/wood, /area/library) @@ -49251,7 +48885,7 @@ "cfx" = ( /obj/machinery/photocopier, /obj/structure/extinguisher_cabinet{ - pixel_y = 32 + pixel_y = 28 }, /turf/simulated/floor/wood, /area/library) @@ -49264,14 +48898,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 +48918,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, @@ -49421,7 +49055,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, @@ -49529,7 +49163,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -49623,7 +49257,6 @@ "cgo" = ( /obj/structure/closet, /obj/item/radio/intercom{ - dir = 8; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -49638,7 +49271,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -49827,7 +49460,7 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -49932,7 +49565,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 +49613,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, @@ -50148,7 +49783,6 @@ /obj/structure/table/wood, /obj/item/flashlight/lamp, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/wood, @@ -50246,8 +49880,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 +50121,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -50511,7 +50147,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/ntrep) @@ -50591,12 +50227,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 +50332,7 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/wood, /area/blueshield) @@ -50747,7 +50381,7 @@ /obj/machinery/firealarm{ dir = 8; pixel_x = -26; - pixel_y = -28 + pixel_y = -26 }, /obj/structure/cable{ d2 = 4; @@ -50947,7 +50581,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/closet/crate, /obj/item/target/syndicate, @@ -50994,8 +50628,7 @@ /area/security/range) "cjx" = ( /obj/machinery/light{ - dir = 1; - in_use = 1 + dir = 1 }, /turf/simulated/floor/plating, /area/security/range) @@ -51259,12 +50892,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 +50915,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 +50944,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -51408,7 +51032,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 +51468,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 +51632,7 @@ /obj/item/camera_film, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/window/reinforced{ dir = 1 @@ -52026,7 +51645,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 +51712,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 +51892,6 @@ "cmf" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -52464,7 +52081,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 +52095,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 +52118,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 +52202,7 @@ /obj/item/radio, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel, /area/teleporter) @@ -52628,8 +52243,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 +52312,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 +52322,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 +52345,7 @@ "cnr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -52756,8 +52369,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 +52422,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 +52588,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 +53071,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 +53381,7 @@ "cpH" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/library) @@ -54197,7 +53808,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 +53860,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -54264,14 +53875,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 +53940,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 +54158,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 +54851,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 +55272,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 +55329,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 +55403,6 @@ /area/library) "ctN" = ( /obj/machinery/light_switch{ - pixel_x = 4; pixel_y = 26 }, /turf/simulated/floor/plasteel{ @@ -56187,8 +55793,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 +55828,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 +56072,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 +56086,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 +56190,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 +56201,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 +56226,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56665,7 +56263,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56688,7 +56286,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 +56423,7 @@ amount = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, @@ -56904,12 +56502,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 +56559,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 +56579,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 +56848,6 @@ /obj/structure/table/wood, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/item/folder, @@ -57293,7 +56868,7 @@ "cwQ" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -57547,7 +57122,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/closet/wardrobe/pjs, /turf/simulated/floor/plasteel{ @@ -57616,12 +57191,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 +57230,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 +57252,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 +57287,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 +57402,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 +57471,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 +57679,6 @@ /area/gateway) "cyz" = ( /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -58120,7 +57689,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 +57761,6 @@ }, /obj/structure/dispenser/oxygen, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -58342,7 +57910,6 @@ /area/crew_quarters/sleep) "cyU" = ( /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/structure/closet/secure_closet/personal/cabinet, @@ -58351,8 +57918,7 @@ /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" @@ -58361,7 +57927,7 @@ "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, @@ -58409,8 +57975,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 +57990,7 @@ "cza" = ( /obj/machinery/cryopod, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -58547,8 +58112,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 +58561,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 @@ -59073,7 +58636,7 @@ /area/crew_quarters/sleep) "cAo" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -59347,7 +58910,6 @@ "cAU" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /turf/simulated/floor/plasteel{ @@ -59431,7 +58993,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 +59145,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/item/storage/belt, /obj/item/radio, @@ -59808,7 +59370,7 @@ "cBV" = ( /obj/structure/chair/office/dark, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -59844,7 +59406,7 @@ "cBY" = ( /obj/machinery/cryopod/right, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -59931,7 +59493,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 +59567,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 +59754,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 +59798,6 @@ }, /obj/structure/table/wood, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/folder/red, @@ -60252,8 +59812,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, @@ -60404,7 +59964,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 +60073,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 +60245,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" @@ -60921,7 +60479,6 @@ /area/hallway/primary/central) "cEM" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -60983,8 +60540,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 +60549,7 @@ /area/hallway/primary/central) "cET" = ( /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61002,7 +60558,7 @@ /area/hallway/primary/central) "cEU" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -61028,7 +60584,7 @@ /area/hallway/primary/central) "cEY" = ( /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -61037,8 +60593,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" @@ -61163,8 +60718,12 @@ 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 }, @@ -61329,8 +60888,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 +60950,6 @@ dir = 8 }, /obj/machinery/status_display{ - layer = 4; pixel_y = 32 }, /obj/machinery/camera{ @@ -61418,8 +60975,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 +60990,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 +61509,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 +61527,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 +61627,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 +61651,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 +61669,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 +61695,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{ @@ -62248,8 +61814,7 @@ /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; @@ -62348,16 +61913,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; @@ -62739,7 +62302,7 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -62840,8 +62403,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 +62420,16 @@ /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" + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_2) "cIv" = ( /obj/structure/girder, /turf/simulated/floor/plasteel{ @@ -63183,7 +62752,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 +62760,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 +62769,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 +62795,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, @@ -63291,8 +62858,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 +62901,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 +62990,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 +63167,6 @@ }, /area/hallway/primary/aft) "cKA" = ( -/obj/item/paicard, /obj/structure/chair/sofa/corp/right, /obj/effect/landmark/start{ name = "Civilian" @@ -63614,8 +63178,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 +63341,6 @@ "cKX" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/item/storage/firstaid/regular, @@ -63833,6 +63395,10 @@ pixel_x = -5; pixel_y = -5 }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -63976,7 +63542,7 @@ "cLo" = ( /obj/structure/dresser, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /turf/simulated/floor/wood, @@ -63987,14 +63553,14 @@ "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) "cLr" = ( /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 28; pixel_y = 28 }, /obj/machinery/cryopod, @@ -64143,8 +63709,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 +63857,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 +63916,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 +64033,9 @@ "cMv" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64575,7 +64139,7 @@ /obj/item/storage/briefcase, /obj/item/cane, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep) @@ -64709,8 +64273,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 +64294,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 +64464,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 +64517,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 +64723,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 +64827,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,7 +64952,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -65572,17 +65108,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 +65137,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 +65181,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 +65206,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 +65237,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, @@ -66107,7 +65636,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plating, /area/medical/medbay3) @@ -66234,9 +65763,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 +65774,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 +65920,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 +65987,7 @@ "cQO" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -66578,8 +66103,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 +66186,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 +66206,6 @@ /area/medical/psych) "cRr" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /obj/item/twohanded/required/kirbyplants, @@ -67300,8 +66822,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 +66869,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 +67042,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 +67311,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 +67401,7 @@ /area/toxins/misc_lab) "cTL" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/machinery/camera{ @@ -67966,7 +67490,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 +67619,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 +67714,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 +67732,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 +67977,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 +67992,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 +68158,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 +68166,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 +68226,7 @@ pixel_y = 32 }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68749,7 +68266,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 +68310,7 @@ pixel_y = -3 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -68929,8 +68446,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 +68470,7 @@ /area/medical/medbay3) "cVW" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68977,8 +68493,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 +68982,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 +68991,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 +69076,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 +69124,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 +69152,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 +69167,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 +69199,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 +69443,6 @@ "cYm" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/item/stack/cable_coil/random, @@ -69970,7 +69467,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 +69636,7 @@ /area/medical/psych) "cYR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/status_display{ pixel_y = 32 @@ -70169,13 +69665,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 +69719,7 @@ "cZa" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ - pixel_x = 26 + pixel_x = 25 }, /obj/machinery/camera{ c_tag = "Medbay Break Room"; @@ -70360,10 +69862,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" }, @@ -70571,7 +70073,7 @@ /area/medical/medbay) "cZJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -70584,29 +70086,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 +70155,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 +70200,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" = ( @@ -70762,8 +70266,7 @@ /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 @@ -70928,8 +70431,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 +70445,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 +70475,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 +70504,7 @@ /area/medical/research) "daF" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -71139,8 +70636,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -71259,12 +70755,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 +70830,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 +70845,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" }, @@ -71389,7 +70893,7 @@ /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) @@ -71469,11 +70973,11 @@ 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" @@ -71742,8 +71246,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 +71390,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 +71413,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 +71505,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; @@ -72265,7 +71761,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 +71822,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 +71894,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 +71968,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 +72105,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 +72124,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 +72176,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 +72217,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 +72227,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 +72247,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 +72296,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -73145,7 +72637,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 +72677,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 +72724,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 +72828,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 +72938,7 @@ }, /obj/machinery/iv_drip, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -73690,8 +73174,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 +73206,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 +73265,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 +73302,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 +73333,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 +73439,7 @@ pixel_x = 24 }, /obj/structure/extinguisher_cabinet{ - pixel_y = 30 + pixel_y = 28 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -73976,8 +73460,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 +73634,7 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74321,7 +73804,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{ @@ -74426,12 +73908,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 +73995,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 +74006,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 +74153,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 +74277,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/machinery/alarm{ @@ -74961,8 +74438,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 +74558,7 @@ /area/medical/medbay) "diM" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 28 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -75269,8 +74745,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 +74977,7 @@ pixel_x = -24 }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -75531,8 +75007,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 +75126,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 +75187,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 +75235,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 +75302,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 +75365,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 +75398,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, @@ -76157,12 +75625,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 +75689,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 +75728,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 +75792,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -76377,7 +75840,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 +75853,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 +75970,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 @@ -76615,8 +76076,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 +76183,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 +76211,6 @@ /area/assembly/chargebay) "dmh" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -76859,8 +76319,7 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76899,8 +76358,7 @@ "dmC" = ( /obj/machinery/vending/medical, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -76944,8 +76402,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{ @@ -76988,8 +76445,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d2 = 4; @@ -77026,6 +76482,7 @@ "dmR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -77169,8 +76626,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" @@ -77394,7 +76850,6 @@ "dnL" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /obj/item/storage/box/disks{ @@ -77422,8 +76877,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 +76924,7 @@ "dnU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/firealarm{ - pixel_y = 24 + pixel_y = 26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -77528,12 +76982,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 +76994,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 +77055,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 +77078,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 +77094,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" }, @@ -77738,8 +77193,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 +77219,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "blobstart" @@ -77825,12 +77279,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 +77350,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 +77364,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ @@ -78012,8 +77464,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 +77520,7 @@ /obj/structure/closet/paramedic, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -78145,12 +77598,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 +77810,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 +77842,7 @@ "dpK" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -78449,7 +77901,6 @@ /obj/structure/table/reinforced, /obj/machinery/light, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28; pixel_y = -28 }, @@ -78458,7 +77909,7 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -78574,7 +78025,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 +78051,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 +78062,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -79001,6 +78452,7 @@ /area/maintenance/gambling_den) "drg" = ( /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, @@ -79070,6 +78522,7 @@ /area/maintenance/port) "drp" = ( /obj/machinery/button/windowtint{ + dir = 1; pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, @@ -79216,8 +78669,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 +78916,6 @@ /area/medical/cmo) "dsi" = ( /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/light{ @@ -79499,8 +78950,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 +79025,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 +79129,7 @@ "dsJ" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/machinery/requests_console{ department = "Robotics"; @@ -79730,8 +79179,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 +79229,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 +79305,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -79869,7 +79315,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 +79608,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 +79633,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{ @@ -80251,7 +79688,6 @@ /obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/item/radio/intercom{ - dir = 0; pixel_x = -28 }, /turf/simulated/floor/plating, @@ -80312,8 +79748,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 +79760,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 +79785,7 @@ icon_state = "1-4" }, /obj/structure/extinguisher_cabinet{ - pixel_y = -30 + pixel_y = -28 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80370,12 +79805,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 +79837,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 +79883,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 4 + pixel_x = -26 }, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -80537,12 +79970,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 +80010,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 +80058,7 @@ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 27; - pixel_y = 5 + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -80679,8 +80102,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 +80146,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 +80154,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"; @@ -80907,7 +80324,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -81030,8 +80446,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 +80525,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 +80552,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 +80598,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 +80792,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 +80871,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 +80898,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 +81054,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 +81135,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 +81193,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 +81236,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 +81251,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 +81329,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 +81340,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 +81566,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 +81750,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 +81818,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 +81901,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 +81916,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plating, /area/security/detectives_office) @@ -82522,8 +81924,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -82578,8 +81979,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 +82207,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 +82368,7 @@ /area/medical/medbay) "dzq" = ( /obj/machinery/light_switch{ + dir = 4; pixel_x = -26 }, /turf/simulated/floor/wood, @@ -83119,6 +82516,7 @@ icon_state = "4-8" }, /obj/machinery/light_switch{ + dir = 4; pixel_x = -26; pixel_y = -26 }, @@ -83127,8 +82525,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 +82537,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 +82625,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 +82743,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/item/cartridge/signal/toxins{ pixel_x = -6 @@ -83370,8 +82767,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 +82832,7 @@ name = "Robotics Operating Computer" }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83554,10 +82950,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 +82970,7 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -83615,12 +83009,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 +83073,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 +83201,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 +83243,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 +83318,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 +83416,7 @@ "dBj" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /obj/structure/cable{ d1 = 1; @@ -84060,13 +83449,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 +83636,7 @@ /area/hallway/primary/aft) "dBR" = ( /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -84254,10 +83644,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 +83825,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 +83870,7 @@ /obj/item/surgicaldrill, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -84639,7 +84026,7 @@ pixel_x = -1 }, /obj/structure/urinal{ - pixel_y = 27 + pixel_y = 28 }, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) @@ -84736,7 +84123,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 +84932,6 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 1; pixel_y = 28 }, /turf/simulated/floor/plasteel{ @@ -85616,7 +85002,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 +85018,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 +85228,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 +85397,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 +85438,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 +85474,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 +85509,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 +85528,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 +85702,7 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 8; pixel_x = 26 }, /turf/simulated/floor/plasteel{ @@ -86332,8 +85713,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 +85734,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,7 +85751,6 @@ /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"; @@ -86393,8 +85762,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/machinery/embedded_controller/radio/airlock/access_controller{ id_tag = "viro_lab_airlock_control"; @@ -86416,14 +85784,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 @@ -86442,14 +85808,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/medical/virology) @@ -86457,8 +85821,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; @@ -86471,8 +85834,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86483,14 +85845,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 +85876,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,7 +85892,7 @@ /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" @@ -86541,8 +85902,7 @@ /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 +85916,6 @@ "dHq" = ( /obj/structure/table/glass, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -86732,8 +86091,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 +86162,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 +86278,7 @@ "dId" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -86933,8 +86289,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -86942,12 +86297,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 +86362,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 +86379,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"; @@ -87046,8 +86397,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 @@ -87069,8 +86419,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 @@ -87256,13 +86605,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 +86619,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; @@ -87292,8 +86638,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 @@ -87308,8 +86653,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -87319,8 +86663,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 +86679,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,8 +86708,8 @@ /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; @@ -87378,8 +86720,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87545,7 +86886,7 @@ sortType = 17 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -87611,7 +86952,7 @@ /area/medical/surgery) "dJP" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -26 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -87622,8 +86963,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,7 +86977,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -87659,8 +86999,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ @@ -87691,8 +87030,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87737,7 +87075,7 @@ "dKd" = ( /obj/structure/table, /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87750,7 +87088,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 28 + pixel_x = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -87773,8 +87111,7 @@ "dKg" = ( /obj/structure/bookcase, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87810,7 +87147,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 +87157,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 +87198,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 +87206,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 +87308,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 +87335,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 +87375,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 +87401,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,36 +87439,43 @@ "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, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /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, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dLd" = ( @@ -88164,8 +87499,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/effect/landmark{ name = "lightsout" @@ -88178,13 +87512,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 +87607,6 @@ "dLp" = ( /obj/structure/table, /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -88323,15 +87651,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 +87848,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 +87878,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 +87889,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 5; @@ -88576,13 +87899,17 @@ "dLY" = ( /obj/structure/closet/l3closet/virology, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/camera{ + c_tag = "Virology decontamination"; + dir = 4; + network = list("Medical","SS13") + }, /turf/simulated/floor/plasteel, /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, @@ -88672,8 +87999,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, @@ -88715,8 +88041,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88726,8 +88051,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 +88064,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 +88079,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88767,8 +88089,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 +88103,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -88816,14 +88136,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 +88170,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 +88191,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -88883,12 +88199,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 +88212,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 +88334,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 +88405,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 +88437,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 +88483,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 +88506,6 @@ pixel_y = 24 }, /obj/item/radio/intercom{ - dir = 4; pixel_x = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -89278,7 +88587,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 +88663,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 +88681,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 +88733,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 +88749,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 +88766,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 +88784,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 +88806,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 +88822,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -89545,12 +88843,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 +88859,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 +88908,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 +88939,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 32 + pixel_x = 30 }, /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -89700,7 +88993,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 +89000,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 +89033,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 +89045,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/structure/sink{ dir = 8; @@ -89779,7 +89068,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 +89086,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 +89227,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 +89291,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 +89303,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 +89312,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 +89330,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 +89366,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 +89383,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 +89401,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 +89420,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 +89443,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 +89474,6 @@ /area/maintenance/apmaint) "dPD" = ( /obj/item/radio/intercom{ - dir = 8; pixel_x = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -90219,15 +89487,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 +89660,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 +89686,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/light{ dir = 4 @@ -90543,8 +89807,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 +89818,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 +89931,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 +89959,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 +89975,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 +90019,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 +90036,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 +90044,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 +90071,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 +90094,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 +90109,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -90900,8 +90152,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 +90165,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 +90191,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 +90222,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 +90238,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 +90309,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 +90319,7 @@ /obj/structure/morgue, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91130,8 +90377,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 +90394,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 +90422,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 +90465,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 +90491,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 +90547,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 +90559,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 +90579,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 +90593,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91364,7 +90605,7 @@ dir = 8 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91386,8 +90627,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 +90644,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 +90690,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 +90775,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 +90784,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 +90798,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 +90808,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 +90843,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 +90904,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 +90913,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 +90960,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 +91015,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 +91032,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 +91044,7 @@ icon_state = "0-8" }, /obj/machinery/light{ - dir = 1; - on = 1 + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -91842,7 +91068,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 +91087,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 +91122,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 +91147,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 +91161,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 +91195,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 +91315,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 +91365,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 +91395,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 +91516,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 +91593,7 @@ /area/engine/engineering) "dUJ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /obj/structure/dresser, /turf/simulated/floor/plasteel{ @@ -92418,8 +91636,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 +91649,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 +91675,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 +91768,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 +91793,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 +92039,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 +92052,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 +92080,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 +92093,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{ @@ -92980,8 +92196,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 +92278,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{ @@ -93176,7 +92391,6 @@ /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, @@ -93199,8 +92413,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - tag = "" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -93265,8 +92478,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 +92560,7 @@ pixel_y = -22 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -28 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93392,7 +92604,6 @@ /area/maintenance/apmaint) "dXz" = ( /obj/item/radio/intercom{ - dir = 1; pixel_y = -28 }, /obj/machinery/camera{ @@ -93468,8 +92679,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 +92721,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 +92774,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 +92831,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 +92846,7 @@ }, /obj/item/storage/box/masks, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -93800,14 +93009,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 +93091,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 +93105,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 +93132,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -93949,8 +93151,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/cable{ d1 = 2; @@ -94012,7 +93213,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 +93352,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 +93403,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "esa" = ( -/obj/structure/cable, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -94215,6 +93415,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 +93514,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; @@ -94404,13 +93612,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 +93842,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 +93937,9 @@ }, /area/security/securearmoury) "fFd" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -94795,7 +94006,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 +94150,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 +94226,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 +94427,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -95267,7 +94464,7 @@ dir = 6 }, /obj/machinery/camera{ - c_tag = "Perma-Brig Solitary"; + c_tag = "Perma-Brig Solitary 1"; network = list("SS13","Security") }, /obj/structure/cable{ @@ -95335,8 +94532,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 +94659,6 @@ network = list("Medical","SS13") }, /obj/machinery/status_display{ - layer = 4; pixel_y = -32 }, /obj/item/reagent_containers/spray/cleaner{ @@ -95753,8 +94948,7 @@ 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 +94964,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 +94978,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 +95181,7 @@ "jqB" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -96004,8 +95198,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - tag = "" + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -96143,8 +95336,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 +95465,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 +95482,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 +95499,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 +95550,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 +95566,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 +95693,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{ @@ -96847,8 +96022,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 +96158,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = -32 + pixel_y = -30 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -96998,8 +96172,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 +96210,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 +96222,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 +96403,7 @@ /area/hallway/secondary/entry) "mYH" = ( /obj/machinery/newscaster{ - pixel_x = -32 + pixel_x = -30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97415,7 +96586,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97432,7 +96603,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 +96617,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 +96700,7 @@ /obj/machinery/recharger, /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -97606,7 +96782,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 +96790,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{ @@ -97681,7 +96847,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24 + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97856,8 +97022,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 +97031,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 +97102,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 +97151,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" @@ -98114,11 +97272,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,7 +97390,7 @@ "pXX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera{ - c_tag = "Perma-Brig Solitary"; + c_tag = "Perma-Brig Solitary 2"; network = list("SS13","Security") }, /turf/simulated/floor/plasteel, @@ -98259,6 +97412,7 @@ /area/security/permasolitary) "qcA" = ( /obj/docking_port/stationary{ + dir = 8; dwidth = 4; height = 11; id = "trade_dock"; @@ -98276,15 +97430,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 +97437,6 @@ }, /area/medical/surgery1) "qli" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -98300,8 +97444,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 +97453,7 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/permabrig) "qmW" = ( @@ -98342,19 +97486,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 @@ -98593,8 +97724,7 @@ "rje" = ( /obj/machinery/firealarm{ dir = 4; - pixel_x = 24; - pixel_y = -4 + pixel_x = 26 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -98669,7 +97799,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 +97838,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 +97879,7 @@ "rHU" = ( /obj/structure/chair, /obj/machinery/newscaster{ - pixel_y = 32 + pixel_y = 30 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -98882,20 +98011,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 +98019,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 +98079,7 @@ "shi" = ( /obj/structure/cable{ d2 = 2; - icon_state = "0-2"; - pixel_y = 1 + icon_state = "0-2" }, /obj/machinery/door/poddoor{ density = 0; @@ -99068,7 +98193,7 @@ "suy" = ( /obj/machinery/firealarm{ dir = 1; - pixel_y = -24 + pixel_y = -26 }, /obj/effect/decal/warning_stripes/south, /obj/machinery/camera{ @@ -99247,13 +98372,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; @@ -99421,7 +98548,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 +98651,6 @@ /area/medical/research) "tNq" = ( /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -99667,8 +98793,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 +98911,6 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/radio/intercom{ - dir = 1; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -100235,19 +99359,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 +99382,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 +99437,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) @@ -100527,16 +99632,6 @@ 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) "wVr" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -100630,8 +99725,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 +99761,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 +99840,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 +99879,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{ @@ -117812,7 +116881,7 @@ aaa aaa abj abj -nZa +bUJ abj coi abj @@ -118069,7 +117138,7 @@ aaa aaa abj aaa -nZa +bUJ aaa csr aaa @@ -118326,7 +117395,7 @@ aaa aaa abj aaa -nZa +bUJ aaa csr aaa @@ -118583,7 +117652,7 @@ aaa aaa abj abj -nZa +bUJ abj coi abj @@ -118840,7 +117909,7 @@ aaa aaZ abj aaa -nZa +bUJ aaa csr aaa @@ -119097,7 +118166,7 @@ aaa aaa abj abj -nZa +bUJ aaa csr aaa @@ -119121,7 +118190,7 @@ aaa aaa aaa aaa -dmq +aaa dmq dmq dmq @@ -119354,7 +118423,7 @@ aaa aaa aaa aaa -nZa +bUJ abj coi abj @@ -119376,10 +118445,10 @@ aaa aaa aaa aaa +aaa cRD cRD cRD -vKt xCC cHA cXX @@ -119611,7 +118680,7 @@ aaa aaa dij abj -nZa +bUJ aaa csr aaa @@ -119633,11 +118702,11 @@ aaa aaa aaa aaa -cTg +aaa cUP cUQ vUu -xCC +cIu elb drn drn @@ -119868,7 +118937,7 @@ acF acF dij aaa -nZa +bUJ aaa csr aaa @@ -119890,18 +118959,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 +119194,7 @@ bwN acF abj abj -nZa +bUJ abj coi abj @@ -120382,7 +119451,7 @@ bwN acF dij aaa -nZa +bUJ aaa csr aaa @@ -120423,7 +119492,7 @@ aaa abj seE bPS -vXX +aaa aaa aaa aaa @@ -120639,7 +119708,7 @@ bwN abj dij aaa -nZa +bUJ aaa csr aaa @@ -120680,7 +119749,7 @@ aaa cHA kdR cHA -vXX +aaa aaa aaa aaa @@ -120896,7 +119965,7 @@ bwN abj abj abj -nZa +bUJ abj coi abj @@ -121153,7 +120222,7 @@ bwN abj dij aaa -nZa +bUJ aaa csr aaa @@ -121194,7 +120263,7 @@ aaa cHA fxr cHA -vXX +aaa aaa aaa aaa @@ -121410,7 +120479,7 @@ bwN abj abj aaa -nZa +bUJ aaa csr aaa @@ -121666,7 +120735,7 @@ bGs bwN abj bVs -wRP +bXG bYJ abj csr @@ -122949,7 +122018,7 @@ bDi bEL bzL bwN -bKa +bNX bMd bNW bUP @@ -128350,7 +127419,7 @@ bKr bMw bQs bOn -bSk +bQt bUv bWu clo @@ -129941,9 +129010,9 @@ dhH djk cAS cAS -vGB +dna doA -kpI +cAS dro dIf cHA @@ -130743,7 +129812,7 @@ dNy dFg dOO dPr -qxp +deW dQM dcA dbp @@ -132027,7 +131096,7 @@ dHs dNC dFg dEi -xoq +dPw dQe dRj dRB @@ -133062,7 +132131,7 @@ dRF dkh dSq dTg -qfH +dOQ dTW abj aaa @@ -133202,7 +132271,7 @@ aOt aPN aRn aSR -aUs +aSP aVV aMW bqe @@ -133459,7 +132528,7 @@ aOu aPO aRo aQq -aUt +aUp aOs aMW bqe @@ -133716,7 +132785,7 @@ aMW aMV aMW aQw -aUu +aXe aMW aMW bqe @@ -133974,8 +133043,8 @@ aTk aFy aRu aUv -apU -aXy +aor +aCn aYT baH bce @@ -134036,7 +133105,7 @@ cIO cIO cIO cIL -cPa +cQP cPe cQU cSg @@ -134437,7 +133506,7 @@ aeb aeO aeb aeb -afK +akb agf agB aeb @@ -134493,7 +133562,7 @@ aOx aXJ baF bcg -bdA +bjh beX baF bhz @@ -135114,7 +134183,7 @@ dRu dPE dQi dQU -gsy +dRu dRM dSe dRM @@ -136020,17 +135089,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 +135344,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 @@ -136788,7 +135857,7 @@ aAv aBy aCr aEw -aDt +aor aFA aGv aHJ @@ -137045,7 +136114,7 @@ aAw aBz aCs aEC -aDt +aor aFA aGw aHK @@ -137302,7 +136371,7 @@ aAx aBA axb aDE -aEy +aLA aFA aGx aHM @@ -137559,7 +136628,7 @@ gpU axb axb aDF -aEy +aLA aFA aGy aHM @@ -137682,7 +136751,7 @@ dNK dOt dOZ dOr -dMj +dyT dRa dRA dJx @@ -137816,7 +136885,7 @@ aAy axd aCt aDG -aEz +azb aFA aGz aHN @@ -137930,15 +136999,15 @@ dku dHA ddy dJx -dKm +duw dKr dKO -dKm +duw dJx -dKm +duw dJx dJx -dKm +duw dJx dJx dJx @@ -138330,7 +137399,7 @@ aBu aCw aCu axe -aDt +aor aFA aGA aMg @@ -138587,7 +137656,7 @@ aAA axe axe axe -aDt +aor aFA aGB aMi @@ -138844,7 +137913,7 @@ aAB aCw aEO axe -aEz +azb aFA aGC aMg @@ -139101,7 +138170,7 @@ aAB axe axe axe -aEz +azb aFA aGD aHP @@ -139615,7 +138684,7 @@ aAD axe aAz aAz -aEz +azb aFA aGF aIZ @@ -139872,7 +138941,7 @@ aAE aEB aCx axe -aHW +aUv aFA aGG aHR @@ -140129,7 +139198,7 @@ axe axe axe axe -aHX +ckl aFA aFA aFA @@ -140386,7 +139455,7 @@ bhO bhO bhO bhO -aED +bhO aFB aGH bhO @@ -140643,7 +139712,7 @@ aAG aXX aXX aXX -aGI +aXX aXZ aGI aXX @@ -140923,7 +139992,7 @@ bhY bhY blq bhY -bSB +bhY bMb bov aXY @@ -141965,7 +141034,7 @@ bAB bCv byU bFy -bHn +cHe bOT bOT bOT @@ -142141,14 +141210,14 @@ aaa aaa aaa aaa -abj -abj -abj aaa -abj +aaa aaa aaa abj +abj +aaa +aaa aaa acC afb @@ -142396,17 +141465,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 @@ -142653,27 +141722,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 +141979,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 @@ -143167,26 +142236,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 @@ -143424,28 +142493,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 @@ -143681,28 +142750,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 @@ -143938,28 +143007,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 @@ -144196,27 +143265,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 +143525,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 +143780,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 +144037,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 +144290,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 +144553,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 @@ -145741,24 +144810,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 @@ -145999,23 +145068,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 @@ -146246,6 +145315,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -146257,22 +145338,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 @@ -146499,6 +145568,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -146514,22 +145595,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 @@ -146756,37 +145825,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 +145961,8 @@ cYP cYP cYP cYP -cJg -cJg +cUr +cUr daZ ctj ddU @@ -147013,37 +146082,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 +146210,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 +146339,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 +146375,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm aoi dZP @@ -147398,17 +146467,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 +146596,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 +146632,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZP dZR @@ -147655,16 +146724,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 +146748,8 @@ dpA cSA cSA cSA -duw cSA +dtG dwK dgW cSA @@ -147784,22 +146853,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 +146889,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa axm dZO dZQ @@ -147913,16 +146982,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 +147107,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 +147244,10 @@ cPU cRt cMz cUs -cXq dcE +daa cZp -cUr +deV cKV cwo cSF @@ -148295,13 +147364,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 +147390,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 +147538,7 @@ dFG aaa dQH dNW -deV +dRf dMy dNl dRi @@ -148552,25 +147621,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,18 +147665,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asR @@ -148688,7 +147757,7 @@ cOi cMC cSP cOg -daa +cVU cXz cpc cZQ @@ -148809,13 +147878,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 +147904,7 @@ acF aaa aaa aaa -aci +acj abj abj abj @@ -148841,18 +147922,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asS @@ -149066,22 +148135,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 +148179,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj asd asT @@ -149326,33 +148395,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 +148652,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 +148692,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa abj @@ -149757,7 +148826,7 @@ dLe dOd dMC dOd -dOd +duO dOG dPj dPS @@ -149840,33 +148909,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 +149166,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 +149218,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa acF acF acF @@ -150354,15 +149423,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 +149478,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj aaa abj @@ -150611,6 +149680,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150644,18 +149725,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaZ aaa aaa @@ -150872,6 +149941,18 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa dij dij abj @@ -150908,18 +149989,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa abj abj abj @@ -151709,7 +150778,7 @@ mhu mhu tOM mhu -aml +cFP bbn ygH bex @@ -151980,7 +151049,7 @@ boO bru bsF bvl -bqK +bvn nDV bCN bzh @@ -152237,7 +151306,7 @@ boP bqO bsG btY -bqO +cGw klk bno bzj @@ -157871,7 +156940,7 @@ abj aIO aNS aPi -aQJ +cFN aSt aTP aVy From abaccacf70f78d4c13e22e61f05509318dfc0884 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 16 Oct 2021 19:47:25 +0100 Subject: [PATCH 12/21] fixed area issues --- _maps/map_files/Delta/delta.dmm | 404 ++++++++++++++++++-------------- 1 file changed, 223 insertions(+), 181 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 43a280d5197..d77cf78b6ee 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -36135,16 +36135,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; @@ -36232,7 +36227,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "bFi" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -37336,7 +37331,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, @@ -38994,7 +38989,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{ @@ -57923,7 +57918,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cyV" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ @@ -57936,7 +57931,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cyW" = ( /obj/machinery/power/apc{ dir = 1; @@ -58633,7 +58628,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cAo" = ( /obj/machinery/newscaster{ pixel_x = -30 @@ -59375,7 +59370,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cBW" = ( /obj/effect/landmark/start{ name = "Barber" @@ -59952,7 +59947,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cDr" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -60370,7 +60365,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cEu" = ( /obj/structure/cable{ d1 = 1; @@ -60687,7 +60682,7 @@ dir = 8; icon_state = "arrival" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFm" = ( /obj/structure/cable{ d1 = 1; @@ -60698,7 +60693,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFn" = ( /obj/structure/cable{ d1 = 4; @@ -60711,7 +60706,7 @@ dir = 1; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFo" = ( /obj/structure/cable{ d1 = 4; @@ -60750,18 +60745,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 @@ -60770,7 +60760,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFs" = ( /obj/structure/cable{ d1 = 4; @@ -60788,7 +60778,7 @@ dir = 1; icon_state = "neutral" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFu" = ( /obj/structure/cable{ d1 = 4; @@ -60806,7 +60796,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFv" = ( /obj/structure/cable{ d1 = 4; @@ -60817,7 +60807,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFw" = ( /obj/structure/cable{ d1 = 4; @@ -60828,7 +60818,7 @@ name = "Cabin" }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cFx" = ( /obj/structure/cable{ d1 = 4; @@ -61779,13 +61769,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 @@ -61797,7 +61787,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -61809,7 +61799,7 @@ 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, @@ -61820,25 +61810,8 @@ 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 }, @@ -61849,7 +61822,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cGX" = ( /obj/machinery/light/small{ dir = 8 @@ -62269,26 +62242,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 @@ -62297,7 +62269,7 @@ dir = 8; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cIh" = ( /obj/machinery/light, /obj/machinery/firealarm{ @@ -62308,13 +62280,8 @@ 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 @@ -62323,29 +62290,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 @@ -62805,7 +62775,7 @@ name = "Cabin" }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cJz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -63546,10 +63516,10 @@ 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{ @@ -63557,7 +63527,7 @@ pixel_y = 28 }, /turf/simulated/floor/carpet, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "cLr" = ( /obj/item/radio/intercom{ pixel_x = 28; @@ -64133,7 +64103,7 @@ /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, @@ -64142,13 +64112,13 @@ 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, @@ -64955,17 +64925,17 @@ 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, @@ -65582,11 +65552,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 @@ -65658,21 +65637,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{ @@ -65681,7 +65660,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{ @@ -94861,6 +94840,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{ @@ -94883,7 +94867,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 @@ -95309,7 +95293,7 @@ name = "Cabin" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/crew_quarters/fitness) "jIs" = ( /turf/simulated/wall/r_wall, /area/security/evidence) @@ -96963,6 +96947,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{ @@ -97163,10 +97162,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, @@ -97220,6 +97224,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{ @@ -97766,7 +97780,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, @@ -98189,7 +98203,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/space) +/area/quartermaster/storage) "suy" = ( /obj/machinery/firealarm{ dir = 1; @@ -98292,6 +98306,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" }, @@ -98514,6 +98533,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{ @@ -98536,11 +98565,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; @@ -98961,6 +98995,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, @@ -99248,11 +99285,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 @@ -119478,7 +119520,7 @@ cie cie bXU xtS -cPY +cWn drn dhG drn @@ -119491,7 +119533,7 @@ cHA aaa abj seE -bPS +cHA aaa aaa aaa @@ -119735,7 +119777,7 @@ bXU bXU bXU iPQ -cPY +cWn drn cHA cHA @@ -149546,10 +149588,10 @@ crX cBQ cnP cnP -aFx -aFx +csi +csi cIa -aFx +csi cLl cMI cQa @@ -149806,7 +149848,7 @@ cnP cFl cGP cIb -aFx +csi cRy cMJ des @@ -150062,8 +150104,8 @@ cDn cuJ cFm cGQ -cIc -aFx +cJz +csi dlw bng cWd @@ -150320,7 +150362,7 @@ bDB cFn cGR cId -aFx +csi cME diP cOo @@ -150576,8 +150618,8 @@ cDp cvV cFv cGS -cIk -aFx +cWh +csi cLn cbm cbm @@ -150825,21 +150867,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 @@ -151082,21 +151124,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 @@ -151339,21 +151381,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 @@ -151596,21 +151638,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 @@ -151862,12 +151904,12 @@ oNd cFr cGW cIi -aFx -aFx -aFx -aFx -aFx -aFx +csi +csi +csi +csi +csi +csi cSY cUy dlz @@ -152116,15 +152158,15 @@ cAo cBW fqy nFX -bEY -cGV -cIc -aFx +cFx +cGW +cJz +csi cLp cMN cOr cQg -aFx +csi cTa dDE dlz @@ -152375,13 +152417,13 @@ wtE cEu cFs rkJ -cIj +cAu cJy cLp cMO cLp cQi -aFx +csi cSY dDE dlz @@ -152631,14 +152673,14 @@ cBX aKk nFX cFv -cGV -cIk -aFx +cGW +cWh +csi cLq cLp cLp cQh -aFx +csi cTb dDD dlz @@ -152888,14 +152930,14 @@ oNd oNd oNd cFu -cGV -cIk -aFx -aFx -aFx -aFx -aFx -aFx +cGW +cWh +csi +csi +csi +csi +csi +csi cjn dDE dlz @@ -153145,12 +153187,12 @@ cBY why bmW cFv -cGV +cGW cIl bmW oXY cBY -cyY +oFL cyY aFx cTc @@ -153404,10 +153446,10 @@ cEv tvI vzs plm -cEv +cPY sOo -cAr -cAr +pEn +tsc cQj aFx cSY From 96181f2ccf5d0be2fe87b03844597dc68688fea8 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 16 Oct 2021 19:53:32 +0100 Subject: [PATCH 13/21] wood fake floors --- _maps/map_files/Delta/delta.dmm | 91 +++++++++++---------------------- 1 file changed, 30 insertions(+), 61 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index d77cf78b6ee..ac968186b91 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -71560,27 +71560,21 @@ "dcJ" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcK" = ( /obj/structure/table/wood, /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcL" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/restraints/handcuffs, /obj/item/grenade/smokebomb, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/starboard) "dcM" = ( /obj/machinery/light/small{ @@ -72377,9 +72371,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{ @@ -72388,16 +72380,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, @@ -76453,10 +76441,10 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dmQ" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/structure/chair/stool{ + dir = 8 }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dmR" = ( /obj/item/twohanded/required/kirbyplants, @@ -78412,9 +78400,7 @@ /area/maintenance/gambling_den) "drd" = ( /obj/structure/table/wood/poker, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dre" = ( /obj/structure/table/wood/poker, @@ -79649,9 +79635,7 @@ /area/maintenance/gambling_den) "dtK" = ( /obj/structure/table/wood, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dtL" = ( /obj/machinery/light/small, @@ -81906,9 +81890,7 @@ 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, @@ -92086,7 +92068,9 @@ /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" }, @@ -92882,7 +92866,9 @@ }, /area/medical/genetics) "dYm" = ( -/obj/structure/chair/stool/bar, +/obj/structure/chair/stool/bar{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -92936,9 +92922,7 @@ /area/medical/research) "dYy" = ( /obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, +/turf/simulated/floor/wood, /area/maintenance/gambling_den) "dYz" = ( /obj/structure/chair/stool/bar, @@ -97006,12 +96990,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, @@ -98464,9 +98442,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, @@ -98511,9 +98487,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, @@ -99657,11 +99631,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; @@ -122627,8 +122596,8 @@ dhw diY dkr dYt -oQs -oQs +dYu +dYu dcX dqZ aMY @@ -122885,7 +122854,7 @@ dfM dfM dfM dmN -wMv +aRm dcX dra dbz @@ -123143,8 +123112,8 @@ dfN aUp dmO aSP -wMv -wMv +aRm +aRm aUp aUp dbz @@ -123913,10 +123882,10 @@ dfN dcX dcX dmO -wMv +aRm dYy drd -wMv +aRm dtL aMW abj @@ -124170,7 +124139,7 @@ aUp dcX dfN dmO -oQs +dYu dYz drc aUp @@ -124684,7 +124653,7 @@ dja aSP aRm dmQ -wMv +aRm dcX drf aMW From 5c0d818d51cb377e2c629e9cabb1e43928d09fb2 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 16 Oct 2021 19:57:56 +0100 Subject: [PATCH 14/21] adds tiny fans (denthamos request) --- _maps/map_files/Delta/delta.dmm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index ac968186b91..0fbc33d05ac 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -350,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" = ( @@ -456,6 +457,7 @@ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, +/obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "afa" = ( @@ -21212,6 +21214,7 @@ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, +/obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_3) "bbJ" = ( @@ -62398,6 +62401,7 @@ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" }, +/obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "cIv" = ( @@ -99058,6 +99062,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"; @@ -158758,7 +158766,7 @@ abj aJx bac abQ -abQ +uZo aJx aaa aaa From 84041e49374c1b08ce65032dd64a855cc461a425 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 16 Oct 2021 20:00:24 +0100 Subject: [PATCH 15/21] holopad fixes --- _maps/map_files/Delta/delta.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 0fbc33d05ac..e3337760a57 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -28498,7 +28498,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/hologram/holopad, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall15"; location = "hall14" @@ -29398,6 +29397,7 @@ /obj/effect/landmark{ name = "Observer-Start" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -69945,9 +69945,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" }, From 2f73c7d96684c82fccbc8af0a0fef498bb323242 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sun, 17 Oct 2021 21:46:43 +0100 Subject: [PATCH 16/21] perma cams, rad shielding --- _maps/map_files/Delta/delta.dmm | 219 ++++++++++++++++---------------- 1 file changed, 113 insertions(+), 106 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e3337760a57..e2e9f7e3a15 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -10079,21 +10079,21 @@ 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 @@ -10103,18 +10103,18 @@ /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) @@ -10511,7 +10511,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aGp" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -10522,7 +10522,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 @@ -10530,7 +10530,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 @@ -10541,7 +10541,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" @@ -10555,7 +10555,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{ @@ -11088,21 +11088,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 @@ -11129,7 +11129,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHI" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -11220,7 +11220,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ @@ -11248,7 +11248,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aHT" = ( /obj/machinery/conveyor{ dir = 4; @@ -11792,7 +11792,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aIS" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -11827,7 +11827,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aIV" = ( /obj/structure/cable{ d1 = 1; @@ -12042,7 +12042,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{ @@ -12461,14 +12461,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 @@ -12476,7 +12476,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{ @@ -12486,7 +12486,7 @@ "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{ pixel_x = -28 @@ -12502,7 +12502,7 @@ 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, @@ -13079,7 +13079,7 @@ pixel_x = -30 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLF" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -13088,13 +13088,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 @@ -13103,7 +13103,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" @@ -13115,7 +13115,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 @@ -13132,7 +13132,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aLL" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -13509,7 +13509,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; @@ -13699,7 +13699,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{ @@ -13714,11 +13714,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, @@ -13738,7 +13738,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ @@ -13749,7 +13749,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aNh" = ( /obj/machinery/light{ dir = 8 @@ -14161,7 +14161,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{ @@ -15817,7 +15817,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aRw" = ( /obj/structure/table/wood, /obj/item/camera, @@ -16188,11 +16188,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, @@ -16537,7 +16537,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aTa" = ( /obj/structure/disposalpipe/junction, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -16550,7 +16550,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aTb" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -17410,7 +17410,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aUE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -17769,7 +17769,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{ @@ -17800,7 +17800,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{ @@ -17839,7 +17839,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{ @@ -18199,7 +18199,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aWe" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -19029,14 +19029,14 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/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, @@ -19429,7 +19429,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{ @@ -19756,7 +19756,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aYY" = ( /obj/effect/landmark{ name = "lightsout" @@ -19769,7 +19769,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "aYZ" = ( /turf/simulated/wall, /area/crew_quarters/kitchen) @@ -20696,7 +20696,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "baL" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, @@ -20704,7 +20704,7 @@ 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, @@ -21457,14 +21457,14 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/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{ @@ -22127,7 +22127,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bdH" = ( /obj/structure/cable{ d1 = 4; @@ -22144,7 +22144,7 @@ dir = 4; icon_state = "neutralcorner" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bdI" = ( /obj/structure/cable{ d1 = 4; @@ -22767,14 +22767,14 @@ 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; @@ -23352,7 +23352,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) @@ -23910,7 +23910,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhF" = ( /obj/structure/cable{ d1 = 1; @@ -23923,7 +23923,7 @@ dir = 1; icon_state = "green" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhG" = ( /obj/machinery/light/small{ dir = 1 @@ -23932,7 +23932,7 @@ dir = 4; icon_state = "red" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bhH" = ( /obj/machinery/smartfridge, /turf/simulated/floor/plasteel, @@ -24902,7 +24902,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "bjn" = ( /obj/structure/cable{ d1 = 1; @@ -24914,7 +24914,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 @@ -24926,7 +24926,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{ @@ -25728,7 +25728,7 @@ dir = 8; icon_state = "greenblue" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "blc" = ( /obj/structure/cable{ d1 = 1; @@ -25738,13 +25738,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; @@ -26127,7 +26127,7 @@ }, /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{ @@ -26718,7 +26718,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{ @@ -57905,7 +57905,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/crew_quarters/sleep) +/area/hallway/primary/central/nw) "cyU" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -58652,7 +58652,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" @@ -94430,7 +94430,7 @@ }, /obj/machinery/camera{ c_tag = "Perma-Brig Solitary 1"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /obj/structure/cable{ d1 = 4; @@ -95720,6 +95720,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 @@ -96507,7 +96510,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; @@ -96813,7 +96816,7 @@ /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; @@ -97385,7 +97388,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera{ c_tag = "Perma-Brig Solitary 2"; - network = list("SS13","Security") + network = list("SS13","Security","Prison") }, /turf/simulated/floor/plasteel, /area/security/permasolitary) @@ -98942,6 +98945,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 @@ -133304,14 +133311,14 @@ aAq awX aCn aDt -aFx -aFx -aFx -aFx -aFx -aFx -aFx -aFx +lqK +lqK +lqK +lqK +lqK +lqK +lqK +lqK aOx aOx aOx @@ -133561,11 +133568,11 @@ ayg awX aCo aEz -aFx +lqK aFs aGo aHA -aFx +lqK aKh aLE aNa @@ -133818,11 +133825,11 @@ aAr awX aor aEy -aFx +lqK aFt aGp aHB -aFx +lqK aKi aLF cAq @@ -134075,11 +134082,11 @@ aDH ayC auR aDw -aFx +lqK aFu aGq aHC -aFx +lqK aKj aLG aNc @@ -134332,11 +134339,11 @@ aor aqF azb aEz -aFx +lqK aHQ aGr aFv -aFx +lqK aMD aLH aNd @@ -134589,11 +134596,11 @@ aBD aBD aES aDx -aFx +lqK aFw aJt cyT -aFx +lqK aKl aNX cAq @@ -134846,14 +134853,14 @@ axb axb axb aDy -aFx -aFx +lqK +lqK aGs -aFx -aFx -aFx +lqK +lqK +lqK aLI -aFx +lqK aOx aOx aOx @@ -134870,7 +134877,7 @@ baF bhE bjm blb -bmW +usr bol bqm buU @@ -135380,11 +135387,11 @@ baL bcm bdH bfd -aFx +lqK bhG bjo bld -bmW +usr boo bqu bIX From e8d4c329becafb4db1b20d2a8f81a84f7c526a28 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Mon, 18 Oct 2021 13:52:24 +0100 Subject: [PATCH 17/21] further fixes --- _maps/map_files/Delta/delta.dmm | 181 +++++++++++++++++--------------- 1 file changed, 97 insertions(+), 84 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e2e9f7e3a15..338dc80e682 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -35924,9 +35924,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{ @@ -35937,9 +35935,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, @@ -36665,18 +36661,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, @@ -46434,14 +46426,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, @@ -46478,18 +46470,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, @@ -47390,7 +47378,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{ @@ -47399,7 +47387,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{ @@ -47450,9 +47438,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{ @@ -47461,9 +47447,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, @@ -48164,12 +48148,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, @@ -48210,9 +48194,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, @@ -48224,9 +48206,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{ @@ -48960,10 +48940,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{ @@ -49004,14 +48984,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{ @@ -49554,7 +49530,7 @@ /area/ntrep) "chl" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet/royalblack, /area/ntrep) "chm" = ( /obj/structure/cable{ @@ -49620,9 +49596,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{ @@ -85719,7 +85693,9 @@ 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{ @@ -85736,7 +85712,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{ @@ -85760,7 +85738,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{ @@ -85778,7 +85758,9 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHe" = ( /obj/structure/cable{ @@ -85791,7 +85773,9 @@ name = "Virology"; req_access_txt = "39" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dHf" = ( /obj/structure/cable{ @@ -85858,7 +85842,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkgreen" }, /area/medical/virology) "dHp" = ( @@ -85887,7 +85872,8 @@ }, /obj/machinery/computer/med_data/laptop, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkgreen" }, /area/medical/virology) "dHr" = ( @@ -86354,7 +86340,9 @@ /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{ @@ -86370,7 +86358,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dIn" = ( @@ -86388,7 +86376,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, /area/medical/virology) "dIo" = ( @@ -86403,7 +86391,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dIp" = ( @@ -86595,7 +86583,9 @@ /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{ @@ -86676,7 +86666,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dJi" = ( @@ -86694,8 +86684,7 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + icon_state = "darkgreencorners" }, /area/medical/virology) "dJk" = ( @@ -86944,7 +86933,8 @@ }, /obj/structure/table, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJT" = ( @@ -86955,7 +86945,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "whitegreencorner" }, /area/medical/virology) "dJU" = ( @@ -86969,14 +86960,16 @@ 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" = ( @@ -86986,7 +86979,8 @@ "dJX" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkgreen" }, /area/medical/virology) "dJY" = ( @@ -87002,7 +86996,8 @@ "dJZ" = ( /obj/machinery/vending/virodrobe, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkgreen" }, /area/medical/virology) "dKa" = ( @@ -87412,7 +87407,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dLb" = ( /obj/structure/cable{ @@ -87439,7 +87436,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dLd" = ( /obj/structure/sink{ @@ -87450,7 +87449,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{ @@ -87867,7 +87868,9 @@ dir = 4; network = list("Medical","SS13") }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreenfull" + }, /area/medical/virology) "dMa" = ( /obj/machinery/light/small, @@ -87876,7 +87879,9 @@ }, /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{ @@ -87998,7 +88003,9 @@ "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{ @@ -92261,7 +92268,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{ @@ -92273,7 +92282,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{ @@ -92331,8 +92342,7 @@ level = 2 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + icon_state = "white" }, /area/medical/virology) "dXd" = ( @@ -92362,7 +92372,9 @@ /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, @@ -92372,7 +92384,9 @@ /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{ @@ -92384,8 +92398,7 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + icon_state = "white" }, /area/medical/virology) "dXi" = ( @@ -151413,7 +151426,7 @@ abj dFH dHp dIn -dJi +dJY dJY dIc aaa From 3094d081a5092f8a36bc9231d045fe6d5e4d7e99 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Tue, 19 Oct 2021 15:32:31 +0100 Subject: [PATCH 18/21] remove duplicate areas --- _maps/map_files/Delta/delta.dmm | 761 +++++++++++++++----------------- 1 file changed, 359 insertions(+), 402 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 338dc80e682..c0a9abdebbf 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -9346,11 +9346,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{ @@ -9359,24 +9354,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, @@ -9711,11 +9695,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, @@ -9750,11 +9729,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 @@ -9776,7 +9750,7 @@ req_access_txt = "31" }, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aEM" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -9790,7 +9764,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aEN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9803,7 +9777,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, @@ -9812,20 +9786,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, @@ -10772,7 +10734,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{ @@ -11258,14 +11220,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) +/area/quartermaster/sorting) "aHX" = ( /obj/structure/cable{ d1 = 4; @@ -11301,7 +11263,7 @@ }, /obj/structure/disposaloutlet, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aIa" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -11311,7 +11273,7 @@ dir = 9; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aIb" = ( /obj/machinery/light{ dir = 1 @@ -11324,7 +11286,7 @@ dir = 1; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aIc" = ( /obj/machinery/firealarm{ dir = 4; @@ -11339,7 +11301,7 @@ dir = 5; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aId" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -11400,7 +11362,7 @@ id = "cargodelivery" }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aIi" = ( /obj/machinery/conveyor/southwest/ccw{ id = "QMLoad2" @@ -11914,13 +11876,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" @@ -11937,13 +11895,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{ @@ -11959,7 +11917,7 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aJk" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 8 @@ -11968,7 +11926,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aJm" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/extinguisher_cabinet{ @@ -12605,7 +12563,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{ @@ -12616,7 +12574,7 @@ "aKx" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aKy" = ( /obj/structure/cable{ d1 = 1; @@ -12628,21 +12586,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, @@ -12660,7 +12618,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aKE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -12668,7 +12626,7 @@ req_access_txt = "31" }, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/quartermaster/office) "aKF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -13240,7 +13198,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{ @@ -13268,7 +13226,7 @@ dir = 1; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aLZ" = ( /obj/structure/cable{ d1 = 1; @@ -13283,7 +13241,7 @@ dir = 5; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aMa" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -13293,7 +13251,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aMb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -13325,7 +13283,7 @@ dir = 8; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -13338,7 +13296,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aMe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -13346,7 +13304,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, @@ -13789,7 +13747,7 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNm" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -13806,7 +13764,7 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow, @@ -13815,17 +13773,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 }, @@ -13833,13 +13782,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 }, @@ -13847,7 +13791,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aNs" = ( /obj/machinery/light{ dir = 4 @@ -13868,7 +13812,7 @@ dir = 4; icon_state = "yellow" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aNt" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -13890,18 +13834,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, @@ -13923,7 +13862,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aNy" = ( /obj/machinery/conveyor_switch/oneway{ id = "cargodisposals"; @@ -13937,7 +13876,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aND" = ( /obj/structure/cable{ d1 = 1; @@ -14235,7 +14174,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/quartermaster/sorting) "aOg" = ( /turf/simulated/wall/r_wall, /area/atmos) @@ -14292,7 +14231,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{ @@ -14362,7 +14301,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/quartermaster/office) "aOx" = ( /turf/simulated/wall, /area/crew_quarters/theatre) @@ -14454,14 +14393,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, @@ -14471,36 +14410,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, @@ -14805,7 +14739,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{ @@ -14980,7 +14914,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPQ" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons{ @@ -14994,7 +14928,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPR" = ( /obj/structure/cable{ d2 = 2; @@ -15012,7 +14946,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPS" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -15020,7 +14954,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPT" = ( /obj/structure/table/wood, /obj/structure/extinguisher_cabinet{ @@ -15033,7 +14967,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -15113,7 +15047,7 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQf" = ( /obj/structure/cable{ d1 = 4; @@ -15133,7 +15067,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQg" = ( /obj/structure/cable{ d1 = 2; @@ -15153,7 +15087,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aQh" = ( /obj/structure/cable{ d1 = 1; @@ -15164,11 +15098,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{ @@ -15191,25 +15127,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, @@ -15240,7 +15171,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 @@ -15766,7 +15697,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRq" = ( /obj/effect/landmark/start{ name = "Clown" @@ -15775,7 +15706,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRr" = ( /obj/structure/cable{ d1 = 1; @@ -15785,7 +15716,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aRs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15921,7 +15852,7 @@ dir = 10; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRM" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -15935,7 +15866,7 @@ /turf/simulated/floor/plasteel{ icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRN" = ( /obj/structure/cable{ d1 = 1; @@ -15947,7 +15878,7 @@ /turf/simulated/floor/plasteel{ icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "aRO" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ @@ -15958,14 +15889,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, @@ -15973,25 +15904,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; @@ -16420,7 +16346,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; @@ -16434,7 +16360,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSV" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -16453,7 +16379,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSW" = ( /obj/structure/cable{ d1 = 4; @@ -16472,7 +16398,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSX" = ( /obj/structure/cable{ d1 = 4; @@ -16484,7 +16410,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 @@ -16506,7 +16432,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/clownoffice) "aSZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16642,7 +16568,7 @@ }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/sorting) "aTj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -16674,13 +16600,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{ @@ -16693,7 +16619,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 @@ -17361,7 +17287,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aUy" = ( /obj/effect/landmark/start{ name = "Mime" @@ -17369,12 +17295,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 @@ -17388,7 +17314,7 @@ /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{ @@ -17585,16 +17511,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 @@ -18147,14 +18070,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{ @@ -18165,7 +18088,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWb" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -18173,7 +18096,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWc" = ( /obj/structure/table/wood, /obj/item/lipstick/random{ @@ -18191,7 +18114,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/crew_quarters/theatre) +/area/clownoffice) "aWd" = ( /obj/structure/disposalpipe/segment, /obj/item/twohanded/required/kirbyplants, @@ -63581,7 +63504,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; @@ -69797,14 +69720,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 @@ -70186,18 +70109,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; @@ -70212,7 +70135,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{ @@ -70227,7 +70150,7 @@ pixel_y = 32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "daj" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -70235,7 +70158,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" @@ -70255,7 +70178,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"; @@ -70270,7 +70193,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dap" = ( /obj/structure/cable{ d1 = 4; @@ -70842,7 +70765,7 @@ "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, @@ -70891,7 +70814,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbE" = ( /obj/structure/cable{ d1 = 4; @@ -70901,7 +70824,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{ @@ -70921,7 +70844,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbH" = ( /obj/structure/cable{ d1 = 1; @@ -70955,7 +70878,7 @@ pixel_x = 32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dbK" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -71557,7 +71480,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcN" = ( /obj/structure/cable{ d1 = 1; @@ -71578,7 +71501,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcQ" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -71591,7 +71514,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -71607,7 +71530,7 @@ "dcT" = ( /obj/structure/chair/wood, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dcU" = ( /obj/structure/cable{ d1 = 1; @@ -71616,7 +71539,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 @@ -71632,12 +71555,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, @@ -72392,7 +72315,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deB" = ( /obj/structure/cable{ d1 = 1; @@ -72407,7 +72330,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deC" = ( /obj/structure/cable{ d1 = 4; @@ -72427,7 +72350,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deD" = ( /obj/structure/cable{ d1 = 4; @@ -72444,7 +72367,7 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deE" = ( /obj/structure/cable{ d1 = 1; @@ -72466,7 +72389,7 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "deF" = ( /obj/structure/cable{ d1 = 1; @@ -72488,7 +72411,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, @@ -72988,13 +72911,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; @@ -73007,7 +72930,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfP" = ( /obj/structure/chair/wood{ dir = 8 @@ -73016,7 +72939,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, @@ -73047,7 +72970,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dfV" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -73720,19 +73643,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" @@ -73806,7 +73729,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, @@ -74612,7 +74535,7 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "diZ" = ( /obj/effect/decal/cleanable/vomit, /obj/effect/landmark{ @@ -74621,13 +74544,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, @@ -75352,7 +75275,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dks" = ( /obj/effect/landmark{ name = "revenantspawn" @@ -75360,7 +75283,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dkt" = ( /obj/structure/cable{ d1 = 1; @@ -75374,7 +75297,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dku" = ( /turf/simulated/wall/rust, /area/maintenance/apmaint) @@ -75386,7 +75309,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dkw" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ @@ -75964,7 +75887,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dlJ" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, @@ -75972,7 +75895,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, @@ -76366,7 +76289,7 @@ "dmM" = ( /obj/structure/chair/wood, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmN" = ( /obj/structure/cable{ d1 = 1; @@ -76383,7 +76306,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmO" = ( /obj/structure/cable{ d1 = 4; @@ -76397,7 +76320,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{ @@ -76415,13 +76338,13 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmQ" = ( /obj/structure/chair/stool{ dir = 8 }, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dmR" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light_switch{ @@ -76762,7 +76685,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{ @@ -77116,7 +77039,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, @@ -77864,7 +77787,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, @@ -78356,41 +78279,41 @@ /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/wood, -/area/maintenance/gambling_den) +/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; @@ -79608,11 +79531,11 @@ pixel_y = -32 }, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dtK" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dtL" = ( /obj/machinery/light/small, /obj/structure/sign/poster/contraband/random{ @@ -79620,7 +79543,7 @@ }, /obj/machinery/vending/boozeomat, /turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dtM" = ( /obj/structure/table, /obj/item/wrench, @@ -80143,7 +80066,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "duU" = ( /obj/structure/computerframe, /turf/simulated/floor/plating, @@ -92083,7 +92006,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dWx" = ( /obj/structure/cable{ d1 = 2; @@ -92887,7 +92810,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYn" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, @@ -92920,11 +92843,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, @@ -92938,7 +92861,7 @@ "dYy" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/wood, -/area/maintenance/gambling_den) +/area/maintenance/abandonedbar) "dYz" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, @@ -92946,7 +92869,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, @@ -93962,6 +93885,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, @@ -94851,6 +94778,9 @@ icon_state = "red" }, /area/security/permabrig) +"irt" = ( +/turf/simulated/wall, +/area/maintenance/abandonedbar) "isz" = ( /obj/structure/cable{ d1 = 1; @@ -94925,6 +94855,12 @@ }, /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; @@ -95267,6 +95203,9 @@ icon_state = "cult" }, /area/magistrateoffice) +"jET" = ( +/turf/simulated/wall, +/area/clownoffice) "jFV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -95911,6 +95850,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"; @@ -97511,6 +97453,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; @@ -97784,6 +97731,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; @@ -99668,7 +99619,7 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office) +/area/quartermaster/sorting) "wVr" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -99947,6 +99898,9 @@ icon_state = "neutralfull" }, /area/hallway/primary/starboard) +"xPn" = ( +/turf/simulated/wall/rust, +/area/maintenance/abandonedbar) "xQW" = ( /obj/structure/cable{ d1 = 4; @@ -100046,6 +100000,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" @@ -121333,9 +121290,9 @@ abj aaa dbz dbz -aMW +irt dbz -aMW +irt dbz dbz aaa @@ -121589,11 +121546,11 @@ abj abj abj dbz -aOs +rlI dhu dhv dWw -aUp +yeh dbz abj abj @@ -121841,21 +121798,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 @@ -122098,21 +122055,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 @@ -122356,14 +122313,14 @@ cUR cWq drn cLz -aUp +yeh dnH dcX -aUp +yeh dYu -aRm -aRm -aRm +lTi +lTi +lTi dYt dnH dnH @@ -122614,10 +122571,10 @@ cWr cXX cLz dbG -aUp -aRm -aSP -aUp +yeh +lTi +iFl +yeh dhw diY dkr @@ -122626,7 +122583,7 @@ dYu dYu dcX dqZ -aMY +xPn abj aaa aaa @@ -122872,7 +122829,7 @@ dlM cLz dag dcX -dcO +fIn deA dfM dfM @@ -122880,7 +122837,7 @@ dfM dfM dfM dmN -aRm +lTi dcX dra dbz @@ -123126,7 +123083,7 @@ cTk cIx cFY cXY -cHA +irt dah dbD dcP @@ -123135,13 +123092,13 @@ dcX dcX dfN dfN -aUp +yeh dmO -aSP -aRm -aRm -aUp -aUp +iFl +lTi +lTi +yeh +yeh dbz aaa abj @@ -123383,23 +123340,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 @@ -123640,8 +123597,8 @@ cTl cIx cWt dsr -cHA -aOs +irt +rlI dfU dcR deD @@ -123649,12 +123606,12 @@ dfN dcX diZ dfN -aUp +yeh dmO dYt dYy drc -aUp +yeh dtK dbz aaa @@ -123897,23 +123854,23 @@ cJW cIx cWt dhG -cHA +irt daj dbE dmM deD dfN -aUp +yeh dfN dcX dcX dmO -aRm +lTi dYy drd -aRm +lTi dtL -aMW +irt abj acF aaa @@ -124154,21 +124111,21 @@ cjH cUS cXS drn -cHA -aUp +irt +yeh dfU dcT deD -aUp -aUp -aUp +yeh +yeh +yeh dcX dfN dmO dYu dYz drc -aUp +yeh dlK dbz aaa @@ -124422,7 +124379,7 @@ dfO dkt dlI dmP -aSP +iFl dcX dre dbz @@ -124676,13 +124633,13 @@ drb dfP dra dja -aSP -aRm +iFl +lTi dmQ -aRm +lTi dcX drf -aMW +irt abj aaa aaa @@ -124934,7 +124891,7 @@ dcX dcX dcX dcX -aUp +yeh dcX dcX dnH @@ -125183,20 +125140,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 @@ -133332,13 +133289,13 @@ lqK lqK lqK lqK -aOx -aOx -aOx +jET +jET +jET aSS -aOx -aOx -aOx +jET +jET +jET bqe baF bcf @@ -133589,13 +133546,13 @@ lqK aKh aLE aNa -aOx +jET aPP aRp aSU aUx aVY -aOx +jET aXJ baF bcg @@ -133846,13 +133803,13 @@ lqK aKi aLF cAq -aOx +jET aPQ aRq aST aUy aVZ -aOx +jET bpZ baF bch @@ -134103,13 +134060,13 @@ lqK aKj aLG aNc -aOx +jET aPR aRr aSW aUz aWa -aOx +jET byM baF bci @@ -134360,13 +134317,13 @@ lqK aMD aLH aNd -aOx +jET aPS aPw aSX aUy aWb -aOx +jET bqe baF bcj @@ -134617,13 +134574,13 @@ lqK aKl aNX cAq -aOx +jET aPT aOn aSV aUA aWc -aOx +jET aYV baF bck @@ -134874,13 +134831,13 @@ lqK lqK aLI lqK -aOx -aOx -aOx +jET +jET +jET aSY -aOx -aOx -aOx +jET +jET +jET aYW baF baF @@ -140265,16 +140222,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 @@ -140522,16 +140479,16 @@ aCA aDK aEG aFD -aGK +ayA aHU -aJd +aEP aMa aLW aNl aOJ aQe aRL -aGK +ayA aUN aWn aXL @@ -140779,16 +140736,16 @@ ayA ayA aDL ayA -aGK +ayA aIh aEN aNx -aUU -aNm +aQl +aCF aOK aQf aRM -aJd +aEP aUO aWo aNm @@ -141041,7 +140998,7 @@ aEM aEN aNp aLY -aZi +aUV aOL aQg aRN @@ -141295,14 +141252,14 @@ aDM aFF aEL aJg -aJf +aCC aKy aLZ aNo wPI aQh aRO -aJd +aEP aUU aWr aXP @@ -141550,16 +141507,16 @@ aCC aCC aEK aFJ -aGK +ayA aKv aKx aKx aNy aTi aOM -aQi -aGK -aGK +aDS +ayA +ayA aUR aWr aXP @@ -142062,17 +142019,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 @@ -142321,7 +142278,7 @@ aCF aCI aDR aJi -ayD +aGK aIa aJj aKB @@ -142578,18 +142535,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 @@ -142833,9 +142790,9 @@ aAR aCH aCH aDQ -aEP +aCH aFL -wXI +aDP aIc aMe aKD @@ -143092,15 +143049,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 From 7de9371e449e6cf1e55bf61c8c655bca9f9811d6 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:22:21 +0100 Subject: [PATCH 19/21] fixes disposals --- _maps/map_files/Delta/delta.dmm | 226 ++++++++++---------------------- 1 file changed, 69 insertions(+), 157 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index c0a9abdebbf..f47cd991d7b 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -4168,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) @@ -4186,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) @@ -4700,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 @@ -4723,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{ @@ -4912,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; @@ -4994,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) @@ -5189,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" = ( @@ -5370,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" @@ -5925,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; @@ -5947,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, @@ -5966,7 +5898,7 @@ /area/maintenance/disposal) "awD" = ( /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 2 }, /obj/structure/disposaloutlet{ dir = 4 @@ -6001,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) @@ -6379,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; @@ -6400,9 +6330,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/fore2) "axw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6414,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; @@ -6437,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; @@ -6456,12 +6383,12 @@ /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; @@ -6474,12 +6401,12 @@ /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; @@ -6492,12 +6419,12 @@ /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; @@ -6507,14 +6434,15 @@ /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; @@ -6531,9 +6459,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "axD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -6542,15 +6467,15 @@ /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" @@ -7084,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 @@ -7164,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, @@ -8559,9 +8474,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -8574,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; @@ -8592,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" }, @@ -8658,9 +8573,6 @@ /turf/simulated/wall, /area/hydroponics/abandoned_garden) "aCm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -96812,9 +96724,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; @@ -144581,7 +144493,7 @@ asM atR asK qWs -ayS +axm osS wXI ixB @@ -144838,7 +144750,7 @@ asN auJ asJ avn -awy +axm aBZ ayD azM @@ -145095,7 +145007,7 @@ amG auO apo avq -awy +axm axw ayD azN @@ -145352,7 +145264,7 @@ asO atS auy avr -awy +axm aCd ayD azO @@ -145609,7 +145521,7 @@ amh amh are asd -awz +asd axx asd azP @@ -146895,7 +146807,7 @@ asd asd avw aqG -axB +atW auE abj abj @@ -147662,7 +147574,7 @@ aaa abj asd asR -atW +asc auZ awE azS @@ -147919,9 +147831,9 @@ aaa abj asd asS -atX +asc +avv avv -auD awF axE asd From 34bf2c6b2b80f512b04aa7515588b625b77bb8cb Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 22 Oct 2021 01:19:17 +0100 Subject: [PATCH 20/21] fixes turret controllers --- _maps/map_files/Delta/delta.dmm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index f47cd991d7b..73539a10ac1 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -34869,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; @@ -37269,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) @@ -44104,7 +44104,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" @@ -107019,7 +107019,7 @@ bms bms bpu bms -aaa +vXX bNM bPH bSr @@ -107541,7 +107541,7 @@ hzl bXI chE bNM -aaa +vXX bpu bms bms @@ -107778,7 +107778,7 @@ aaa ops bpo brs -aaa +vXX btd btd btd @@ -108292,7 +108292,7 @@ oBS adM bpo brs -aaa +vXX btd bvz bwH @@ -109834,7 +109834,7 @@ oMO fPS bJP brs -aaa +vXX btd bvz bwH @@ -110348,7 +110348,7 @@ aaa pnF bJP brs -aaa +vXX btd btd btd @@ -110625,7 +110625,7 @@ bTL bXI bXM bNM -aaa +vXX bpm bmo bmo @@ -111131,7 +111131,7 @@ bmo bmo bpm bmo -aaa +vXX bNM bRt bXI From 922b2437a55aac7f029246940184b017e64ba1d6 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sun, 24 Oct 2021 20:10:22 +0100 Subject: [PATCH 21/21] det office lights --- _maps/map_files/Delta/delta.dmm | 48 ++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 73539a10ac1..7314389a6b0 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -39172,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" @@ -40937,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" @@ -43024,6 +43025,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -48952,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" = ( @@ -49091,6 +49100,10 @@ dir = 8 }, /obj/structure/closet, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49602,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" = ( @@ -93351,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" @@ -95568,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, @@ -98094,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{ @@ -149934,10 +149962,10 @@ eSX bFX bFX bEr -bFX +bLy bMc bFX -bLy +bFX bFX bFX bRd @@ -156366,7 +156394,7 @@ rNi iVV miL frI -tmo +szk jQY aaa abj