From 12c302c2e014baac49f4fee0d2fb51db169d23be Mon Sep 17 00:00:00 2001 From: Crosarius <30341877+Crosarius@users.noreply.github.com> Date: Mon, 3 Aug 2020 00:01:41 +1000 Subject: [PATCH] Fix Powernet Cross Between Main Grid & Civillian Surface Subnet (#9559) --- html/changelogs/Crosarius-PR-PowerNetFix.yml | 7 + maps/aurora/aurora-6_surface.dmm | 354 ++++++++++--------- 2 files changed, 193 insertions(+), 168 deletions(-) create mode 100644 html/changelogs/Crosarius-PR-PowerNetFix.yml diff --git a/html/changelogs/Crosarius-PR-PowerNetFix.yml b/html/changelogs/Crosarius-PR-PowerNetFix.yml new file mode 100644 index 00000000000..e6d6319c3cc --- /dev/null +++ b/html/changelogs/Crosarius-PR-PowerNetFix.yml @@ -0,0 +1,7 @@ +author: Crosarius +delete-after: True + +changes: + - bugfix: "Removed a wire crossover between the mains powernet and the civillian surface subnet, which was occuring in the emergency service dock." + + - bugfix: "Fixed a hanging loose end of cable which should connect telecommunications (and its solars) to civillian surface mains grid." diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index b031c5ff0e4..0a15d903fec 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -236,13 +236,13 @@ pixel_y = 12 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - tag_airpump = "solar_tool_pump"; - tag_exterior_door = "solar_tool_outer"; id_tag = "solar_tool_airlock"; - tag_interior_door = "solar_tool_inner"; pixel_x = 25; req_access = list(13); - tag_chamber_sensor = "solar_tool_sensor" + tag_airpump = "solar_tool_pump"; + tag_chamber_sensor = "solar_tool_sensor"; + tag_exterior_door = "solar_tool_outer"; + tag_interior_door = "solar_tool_inner" }, /obj/structure/cable/yellow{ d1 = 1; @@ -417,8 +417,8 @@ pixel_x = -24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/camera/network/telecom{ c_tag = "Telecomms - Fore Solar Maintenance"; @@ -447,8 +447,8 @@ icon_state = "0-8" }, /obj/machinery/power/smes/buildable{ - cur_coils = 2; - RCon_tag = "Solar - Fore TComms" + RCon_tag = "Solar - Fore TComms"; + cur_coils = 2 }, /turf/simulated/floor/plating, /area/maintenance/foresolar) @@ -1058,13 +1058,13 @@ /area/turret_protected/tcomsat) "bY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/light/small, +/obj/structure/lattice/catwalk/indoor, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/light/small, -/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/maintenance/solarmaint) "bZ" = ( @@ -1595,8 +1595,8 @@ dir = 4 }, /turf/simulated/floor/tiled{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/turret_protected/tcomsat) "df" = ( @@ -2465,8 +2465,8 @@ /area/hallway/secondary/entry/dock) "eE" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/flora/pottedplant{ icon_state = "plant-09" @@ -3228,8 +3228,8 @@ icon_state = "0-2" }, /obj/machinery/power/smes/buildable{ - cur_coils = 2; - RCon_tag = "Solar - Port TComms" + RCon_tag = "Solar - Port TComms"; + cur_coils = 2 }, /turf/simulated/floor/plating, /area/maintenance/portsolar) @@ -3492,8 +3492,8 @@ dir = 5 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) @@ -3839,8 +3839,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -3869,8 +3869,8 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled{ - icon_state = "vault"; - dir = 5 + dir = 5; + icon_state = "vault" }, /area/turret_protected/tcomsat) "hj" = ( @@ -5091,9 +5091,9 @@ external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; - use_power = 1; pressure_checks = 0; - pressure_checks_default = 0 + pressure_checks_default = 0; + use_power = 1 }, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -5129,10 +5129,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; - use_power = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0 + pump_direction = 0; + use_power = 1 }, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -6512,13 +6512,21 @@ /area/hallway/secondary/entry/fore) "mb" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor, +/obj/structure/lattice/catwalk/indoor{ + layer = 2.6 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Roof Solar Access"; + req_access = list(12) + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/entry/emergency) +/turf/simulated/floor/plating, +/area/maintenance/solarmaint) "mc" = ( /obj/structure/closet/cabinet{ layer = 2.9 @@ -7815,8 +7823,8 @@ "oA" = ( /obj/machinery/vending/cola, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/lino/grey, /area/hallway/secondary/entry/departure_lounge) @@ -8420,8 +8428,8 @@ pixel_x = -24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) @@ -8446,8 +8454,8 @@ icon_state = "0-8" }, /obj/machinery/power/smes/buildable{ - cur_coils = 2; - RCon_tag = "Solar - Aft TComms" + RCon_tag = "Solar - Aft TComms"; + cur_coils = 2 }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) @@ -9216,8 +9224,8 @@ }, /obj/structure/flora/pottedplant/random, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) @@ -10149,8 +10157,8 @@ /area/hydroponics/garden) "tf" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) @@ -10820,8 +10828,8 @@ }, /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/locker) @@ -11066,8 +11074,8 @@ dir = 8 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/structure/flora/pottedplant{ icon_state = "plant-28" @@ -11318,8 +11326,8 @@ /area/maintenance/cargo/surface) "vB" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/bridge/levela) @@ -11944,11 +11952,6 @@ /turf/simulated/floor/plating, /area/maintenance/cargo/surface) "wP" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -12224,8 +12227,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) @@ -13035,8 +13038,8 @@ /area/bridge/levela) "yS" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/locker) @@ -13164,8 +13167,8 @@ /area/hallway/secondary/entry/central) "ze" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -13203,8 +13206,8 @@ }, /obj/machinery/hologram/holopad, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/blue{ dir = 8 @@ -13233,8 +13236,8 @@ /area/maintenance/bridge_elevator/surface) "zl" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/bed/chair{ dir = 4 @@ -13328,8 +13331,8 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -13338,8 +13341,8 @@ "zx" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/machinery/camera/network/civilian_surface{ c_tag = "Surface - Corridor Camera 5" @@ -13699,8 +13702,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) @@ -13802,12 +13805,12 @@ /area/crew_quarters/fitness/changing) "Ah" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Ai" = ( @@ -13951,13 +13954,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "As" = ( @@ -14596,8 +14599,8 @@ "BF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/machinery/alarm{ pixel_y = 28 @@ -15068,8 +15071,8 @@ dir = 8 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/tiled, /area/storage/shields) @@ -15129,13 +15132,13 @@ "CK" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/smes/buildable{ + RCon_tag = "Surface - Shield Substation"; charge = 1e+007; cur_coils = 4; input_attempt = 1; input_level = 500000; output_attempt = 1; - output_level = 500000; - RCon_tag = "Surface - Shield Substation" + output_level = 500000 }, /obj/structure/cable/cyan{ d2 = 4; @@ -15358,15 +15361,15 @@ /area/maintenance/solarmaint) "Dh" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Di" = ( @@ -15442,8 +15445,13 @@ }, /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/store) @@ -15726,8 +15734,8 @@ /area/shuttle/research/station) "DR" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15742,8 +15750,8 @@ /area/hallway/secondary/entry/stairs) "DT" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) @@ -16000,8 +16008,8 @@ /area/hallway/secondary/entry/aft) "Es" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/structure/bed/chair, /obj/effect/floor_decal/corner/grey{ @@ -17849,8 +17857,8 @@ dir = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/structure/flora/pottedplant{ icon_state = "plant-29" @@ -18235,8 +18243,8 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) @@ -18254,8 +18262,8 @@ /area/shuttle/research/station) "Ix" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/firealarm/west, /obj/machinery/light_switch{ @@ -18288,8 +18296,8 @@ pixel_y = 24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/cargo/surface) @@ -18407,15 +18415,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/levela/research_dock) -"IM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/hallway/secondary/entry/emergency) "IN" = ( /obj/effect/floor_decal/corner/white/diagonal{ dir = 4 @@ -19463,8 +19462,8 @@ /area/maintenance/solarmaint) "La" = ( /obj/structure/bed/chair/comfy/black{ - icon_state = "chair_padding_over"; - dir = 1 + dir = 1; + icon_state = "chair_padding_over" }, /obj/machinery/newscaster{ pixel_y = -32 @@ -19765,8 +19764,8 @@ /area/storage/tools) "Lv" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) @@ -20349,8 +20348,8 @@ /area/bridge/levela) "ME" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/structure/flora/pottedplant{ icon_state = "plant-30" @@ -20660,8 +20659,8 @@ /area/maintenance/telecoms_ladder) "Nj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ pixel_y = 28 @@ -21107,16 +21106,6 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) "Om" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -21124,6 +21113,16 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "On" = ( @@ -21716,8 +21715,8 @@ /area/maintenance/solarmaint) "PE" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -21878,8 +21877,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/storage/tools) @@ -22235,8 +22234,8 @@ /area/hallway/secondary/entry/dock) "QI" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/bed/chair{ dir = 4 @@ -22259,8 +22258,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/item/towel, /turf/simulated/floor/tiled/freezer, @@ -22317,13 +22316,13 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "QR" = ( +/obj/structure/lattice/catwalk/indoor, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/maintenance/solarmaint) "QS" = ( @@ -22919,19 +22918,14 @@ /turf/simulated/floor/plating, /area/maintenance/solarmaint) "Sg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) @@ -23128,6 +23122,21 @@ /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/grass/alt, /area/hallway/secondary/entry/fore) +"SF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "SG" = ( /obj/structure/cable/blue{ icon_state = "0-4" @@ -23694,8 +23703,8 @@ /area/maintenance/store) "TO" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -24182,6 +24191,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/arrivals) +"UU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/emergency) "UV" = ( /turf/simulated/wall, /area/hallway/secondary/entry/central) @@ -24225,15 +24243,15 @@ }, /area/crew_quarters/fitness/pool) "Va" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/lattice/catwalk/indoor, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/maintenance/solarmaint) "Vb" = ( @@ -24359,8 +24377,8 @@ /area/hallway/secondary/entry/fore) "Vq" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) @@ -24946,8 +24964,8 @@ "Wu" = ( /obj/structure/closet/wardrobe/white, /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/locker) @@ -25726,8 +25744,8 @@ /area/hallway/secondary/entry/emergency) "Ya" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/closet/athletic_mixed, /turf/simulated/floor/tiled/dark, @@ -25764,8 +25782,8 @@ "Yf" = ( /obj/structure/closet/lasertag/blue, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/gun/energy/lasertag/blue, /obj/item/gun/energy/lasertag/blue, @@ -26017,8 +26035,8 @@ /area/hallway/secondary/entry/aft) "YC" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -26348,8 +26366,8 @@ /area/storage/tools) "Zn" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 1 + dir = 1; + icon_state = "tube1" }, /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/tiled, @@ -26548,8 +26566,8 @@ /area/hallway/secondary/entry/aft) "ZK" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/storage/toolbox/emergency, /obj/structure/closet/emcloset, @@ -49988,7 +50006,7 @@ nJ BF Sg Rx -nn +SF nn xH nn @@ -50246,21 +50264,21 @@ Cr wP Ar Om -IM +UU Ah Dh -mb -mb +UU +UU nl -mb -mb +UU +UU Dh Ys -mb +UU tL -mb +UU Ng -KZ +mb QR bY Rz