diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index 43d06e57e1..085a64bf97 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -29,6 +29,9 @@ /area/engine/atmos) "ai" = ( /obj/machinery/power/rtg/advanced, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating/airless, /area/space/nearstation) "aj" = ( @@ -52,20 +55,17 @@ /area/engine/atmos) "an" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/space, /area/space/nearstation) "ao" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/power/rtg/advanced, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/space, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/airless, /area/space/nearstation) "ap" = ( /obj/machinery/airalarm{ @@ -73,21 +73,12 @@ locked = 0; pixel_y = 23 }, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, /obj/structure/closet/secure_closet/engineering_electrical, -/obj/structure/cable{ - icon_state = "0-4" - }, /turf/open/floor/plasteel, /area/engine/engineering) "aq" = ( /obj/machinery/computer/monitor, -/obj/structure/cable{ - icon_state = "2-8" - }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) "ar" = ( @@ -95,48 +86,30 @@ /turf/open/floor/plasteel, /area/engine/engineering) "as" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) +/turf/open/space, +/area/space/nearstation) "at" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Gravity Generator APC"; - pixel_y = 25 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/power/terminal{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "au" = ( /turf/open/openspace, -/area/security) +/area/space) "av" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/stairs{ + dir = 1 }, -/turf/open/openspace, -/area/security) +/turf/open/floor/plating, +/area/hallway/secondary/service) "aw" = ( /turf/open/floor/plating, /area/engine/atmos) @@ -158,66 +131,81 @@ /turf/open/floor/plating, /area/engine/atmos) "aA" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/power/smes{ + charge = 5e+006 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/space, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) "aB" = ( /obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/space, /area/space/nearstation) "aC" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/openspace, -/area/security) -"aD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space, +/area/space/nearstation) +"aD" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/engine/engineering) "aE" = ( +/obj/structure/fans/tiny, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aF" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aH" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/open/floor/plasteel, /area/engine/engineering) -"aG" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"aH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) "aI" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -267,22 +255,26 @@ /turf/open/floor/plating, /area/engine/atmos) "aQ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/light{ + dir = 8 }, -/turf/open/space, -/area/space/nearstation) -"aR" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/space, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/gravity_generator) +"aR" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aS" = ( /obj/structure/table, /obj/item/flashlight{ @@ -293,41 +285,50 @@ /area/engine/engineering) "aT" = ( /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/engine/engineering) +/area/engine/gravity_generator) "aU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "aV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/gravity_generator) -"aW" = ( +/obj/machinery/power/rtg/advanced, /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"aW" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/engine/gravity_generator) +/area/engine/engineering) "aX" = ( -/obj/machinery/gravity_generator/main/station, -/turf/open/openspace, -/area/security) +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -25 + }, +/obj/machinery/light, +/obj/structure/table, +/obj/item/analyzer, +/obj/item/wrench, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/engine/atmos) "aY" = ( /obj/machinery/light{ dir = 4 @@ -366,14 +367,22 @@ "bd" = ( /obj/structure/table, /obj/item/weldingtool/experimental, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -25 + }, +/obj/structure/cable, /turf/open/floor/plating, /area/engine/engineering) "be" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/engine/engineering) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/engine/atmos) "bf" = ( /obj/structure/closet/secure_closet/engineering_chief, /turf/open/floor/plating, @@ -382,6 +391,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 8; + name = "Gravity Generator APC"; + pixel_x = -25 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bh" = ( @@ -397,25 +412,20 @@ }, /area/engine/gravity_generator) "bj" = ( -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/machinery/light, -/obj/structure/table, -/obj/item/analyzer, -/obj/item/wrench, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engine/atmos) "bk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/door/airlock, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plating, -/area/engine/atmos) +/area/engine/engineering) "bl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -424,7 +434,8 @@ /turf/open/floor/plating, /area/engine/atmos) "bm" = ( -/obj/machinery/atmospherics/components/binary/valve{ +/obj/machinery/atmospherics/components/binary/valve/on{ + icon_state = "mvalve_map-2"; dir = 4 }, /turf/open/floor/plating, @@ -440,7 +451,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/table, /obj/item/screwdriver/power, -/obj/item/wirecutters/power, +/obj/item/crowbar/power, /turf/open/floor/plating, /area/engine/engineering) "bp" = ( @@ -467,12 +478,16 @@ icon_state = "1-2" }, /turf/closed/wall/r_wall, -/area/hallway/primary/central) +/area/engine/gravity_generator) "bt" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/hallway/primary/central) "bu" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -485,12 +500,14 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "bx" = ( -/obj/machinery/door/airlock, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/turf/open/floor/plating, -/area/engine/engineering) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "by" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/entry) @@ -506,11 +523,7 @@ "bB" = ( /obj/machinery/power/apc{ dir = 8; - pixel_x = -24 - }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2" + pixel_x = -25 }, /obj/machinery/airalarm{ frequency = 1439; @@ -518,6 +531,7 @@ pixel_y = 23 }, /obj/structure/closet/jcloset, +/obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/central) "bC" = ( @@ -527,11 +541,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 + }, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -25 + }, +/obj/structure/closet/secure_closet/captains, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/bridge) "bE" = ( /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -540,27 +566,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bG" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 - }, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/structure/closet/secure_closet/captains, -/turf/open/floor/plasteel{ - dir = 8 - }, +/obj/structure/table, +/obj/item/ammo_box/c10mm, +/obj/item/gun/ballistic/automatic/pistol, +/turf/open/floor/plasteel, /area/bridge) "bH" = ( /obj/structure/table, -/obj/item/ammo_box/c10mm, -/obj/item/gun/ballistic, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/construction/rcd, /turf/open/floor/plasteel, /area/bridge) "bI" = ( @@ -578,13 +594,11 @@ /turf/open/floor/plasteel, /area/bridge) "bL" = ( -/obj/structure/table, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/construction/rcd, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, -/area/bridge) +/area/hallway/primary/central) "bM" = ( /obj/structure/closet/secure_closet/hop, /turf/open/floor/plasteel{ @@ -597,26 +611,34 @@ /area/hallway/primary/central) "bO" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/turf/open/floor/plasteel{ + dir = 8 + }, +/area/bridge) "bP" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel, /area/hallway/primary/central) "bQ" = ( -/obj/machinery/vending/coffee, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/bridge) "bR" = ( -/obj/machinery/vending/cola, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/bridge) "bS" = ( -/obj/machinery/vending/snack, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/bridge) "bT" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel, @@ -629,12 +651,10 @@ }, /obj/machinery/power/apc{ dir = 8; - pixel_x = -24 - }, -/obj/structure/cable{ - icon_state = "0-2" + pixel_x = -25 }, /obj/structure/closet/firecloset/full, +/obj/structure/cable, /turf/open/floor/plasteel{ dir = 9 }, @@ -669,19 +689,19 @@ /turf/open/floor/plating, /area/hallway/primary/central) "ca" = ( +/obj/machinery/door/airlock, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, +/turf/open/floor/plasteel, +/area/bridge) +"cb" = ( /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"cb" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "cc" = ( @@ -691,77 +711,104 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cd" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/bridge) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "ce" = ( +/obj/machinery/door/airlock/glass, /obj/structure/cable{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"cf" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel{ + dir = 8 + }, +/area/hallway/secondary/entry) +"cg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plasteel{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"ch" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/area/bridge) -"cf" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/bridge) -"cg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/area/hallway/primary/central) +"ci" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plasteel{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/area/bridge) -"ch" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating, -/area/bridge) -"ci" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "4-8" +/turf/open/floor/plasteel{ + dir = 4 }, -/turf/open/floor/plasteel, /area/hallway/primary/central) "cj" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" +/turf/open/floor/plasteel{ + dir = 1 }, -/turf/open/floor/plasteel, /area/hallway/primary/central) "ck" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/closed/wall/r_wall, -/area/hallway/secondary/entry) -"cl" = ( -/obj/structure/cable{ - icon_state = "1-8" +/turf/open/floor/plasteel{ + dir = 1 }, +/area/hallway/primary/central) +"cl" = ( +/obj/structure/cable, /turf/open/floor/plasteel{ dir = 8 }, /area/hallway/secondary/entry) +"cm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + dir = 1 + }, +/area/hallway/primary/central) "cn" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, @@ -779,6 +826,20 @@ dir = 10 }, /area/bridge) +"cq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel{ + dir = 1 + }, +/area/hallway/primary/central) "cr" = ( /obj/machinery/light, /turf/open/floor/plasteel{ @@ -786,11 +847,19 @@ }, /area/bridge) "cs" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/closed/wall/r_wall, -/area/bridge) +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel{ + dir = 1 + }, +/area/hallway/primary/central) "ct" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -798,26 +867,47 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"cu" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "cv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/bridge) "cw" = ( -/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, -/area/bridge) +/area/hallway/primary/central) "cx" = ( -/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/area/hallway/primary/central) "cy" = ( /turf/open/floor/plasteel{ dir = 8 }, /area/hallway/secondary/entry) "cz" = ( -/turf/open/floor/plating, -/area/hallway/secondary/entry) +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/construction) "cA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -825,48 +915,43 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel{ - dir = 4 - }, -/area/hallway/primary/central) -"cC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/hallway/primary/central) -"cD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/hallway/primary/central) -"cE" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/turf/open/floor/plating, +/area/construction) +"cC" = ( +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/hallway/primary/central) -"cF" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/storage/primary) +"cD" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/construction) +"cE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/construction) +"cF" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/construction) "cG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -921,10 +1006,11 @@ /turf/closed/wall/r_wall, /area/construction) "cO" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable{ icon_state = "1-2" }, -/turf/closed/wall/r_wall, +/turf/open/floor/plasteel, /area/construction) "cP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -942,10 +1028,22 @@ /turf/closed/wall/r_wall, /area/storage/primary) "cT" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/airalarm{ + frequency = 1439; + locked = 0; + pixel_y = 23 }, -/turf/closed/wall/r_wall, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -25 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, /area/storage/primary) "cU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -956,56 +1054,43 @@ /turf/open/floor/plasteel, /area/storage/primary) "cW" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 - }, -/obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel, -/area/construction) -"cX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/construction) +/area/storage/primary) +"cX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/storage/primary) "cY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/construction) "cZ" = ( /obj/effect/turf_decal/stripes/corner{ - dir = 1 + dir = 8 }, /obj/structure/ladder, /turf/open/floor/plasteel, /area/construction) "da" = ( -/obj/machinery/airalarm{ - frequency = 1439; - locked = 0; - pixel_y = 23 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel, /area/storage/primary) "db" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, /turf/open/floor/plasteel, /area/storage/primary) @@ -1016,10 +1101,11 @@ /turf/open/floor/plasteel, /area/storage/primary) "dd" = ( -/turf/open/floor/plasteel{ - icon_state = "L1" +/obj/structure/cable{ + icon_state = "1-2" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/construction) "de" = ( /obj/machinery/light{ dir = 1 @@ -1027,25 +1113,41 @@ /turf/open/floor/plasteel, /area/storage/primary) "df" = ( -/turf/open/floor/plasteel{ - icon_state = "L5" +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-4" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/construction) "dg" = ( -/turf/open/floor/plasteel{ - icon_state = "L7" +/obj/structure/cable{ + icon_state = "4-8" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/construction) "dh" = ( -/turf/open/floor/plasteel{ - icon_state = "L9" +/obj/machinery/power/deck_relay, +/obj/structure/cable{ + icon_state = "1-8" }, -/area/storage/primary) +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/construction) +"di" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/hallway/secondary/service) "dj" = ( -/turf/open/floor/plasteel{ - icon_state = "L13" +/obj/structure/cable{ + icon_state = "4-8" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/hallway/secondary/service) "dk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1065,8 +1167,12 @@ /turf/open/floor/plasteel, /area/construction) "dn" = ( +/obj/machinery/power/deck_relay, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/construction) +/area/hallway/secondary/service) "do" = ( /obj/machinery/light{ dir = 4 @@ -1083,40 +1189,25 @@ /turf/open/floor/plating, /area/storage/primary) "dq" = ( -/turf/open/floor/plasteel{ - icon_state = "L2" +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable{ + icon_state = "0-4" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/engine/storage) "dr" = ( -/turf/open/floor/plasteel{ - icon_state = "L4" +/obj/structure/cable{ + icon_state = "4-8" }, -/area/storage/primary) +/turf/open/floor/plating, +/area/engine/storage) "ds" = ( -/turf/open/floor/plasteel{ - icon_state = "L6" +/obj/machinery/power/deck_relay, +/obj/structure/cable{ + icon_state = "0-8" }, -/area/storage/primary) -"dt" = ( -/turf/open/floor/plasteel{ - icon_state = "L8" - }, -/area/storage/primary) -"du" = ( -/turf/open/floor/plasteel{ - icon_state = "L10" - }, -/area/storage/primary) -"dv" = ( -/turf/open/floor/plasteel{ - icon_state = "L12" - }, -/area/storage/primary) -"dw" = ( -/turf/open/floor/plasteel{ - icon_state = "L14" - }, -/area/storage/primary) +/turf/open/floor/plating, +/area/engine/storage) "dx" = ( /obj/machinery/light{ dir = 4 @@ -1180,7 +1271,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/engine/storage) "dH" = ( /obj/effect/landmark/start, /turf/open/floor/plasteel, @@ -1192,12 +1283,6 @@ "dJ" = ( /turf/open/floor/plasteel, /area/storage/primary) -"dK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/construction) "dL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1241,14 +1326,8 @@ /turf/open/floor/plasteel, /area/storage/primary) "dS" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/engine/storage) "dV" = ( /turf/open/floor/plasteel, /area/engine/gravity_generator) @@ -1259,25 +1338,10 @@ /turf/open/floor/plasteel{ dir = 2 }, -/area/engine/atmos) +/area/hallway/secondary/service) "dY" = ( /turf/open/floor/plasteel, -/area/engine/atmos) -"dZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/external/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) -"ea" = ( -/turf/open/floor/plasteel{ - dir = 8 - }, -/area/bridge) +/area/hallway/secondary/service) "eb" = ( /turf/open/floor/plasteel, /area/bridge) @@ -1292,110 +1356,50 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/hallway/secondary/service) "ee" = ( /turf/open/floor/plasteel{ dir = 9 }, -/area/hallway/secondary/entry) -"ef" = ( -/turf/open/floor/plasteel{ - dir = 1 - }, -/area/hallway/secondary/entry) -"eg" = ( -/turf/open/floor/plating, -/area/hallway/primary/central) -"eh" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel{ - dir = 10 - }, -/area/bridge) -"ei" = ( -/obj/machinery/light{ +/area/hallway/secondary/service) +"ej" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, -/turf/open/floor/plasteel{ - dir = 6 - }, -/area/bridge) -"ej" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/plasteel, -/area/hallway/primary/central) -"ek" = ( -/turf/open/floor/plasteel{ - dir = 4 - }, -/area/hallway/primary/central) +/area/engine/storage) "em" = ( +/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel{ dir = 1 }, -/area/hallway/primary/central) +/area/hallway/secondary/service) "en" = ( /turf/open/floor/plasteel{ dir = 10 }, -/area/hallway/secondary/entry) +/area/hallway/secondary/service) "eo" = ( /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"ep" = ( -/turf/open/floor/plasteel, -/area/construction) -"eq" = ( -/turf/open/floor/plasteel{ - icon_state = "L3" - }, -/area/storage/primary) -"er" = ( -/turf/open/floor/plasteel{ - icon_state = "L11" - }, -/area/storage/primary) "es" = ( /obj/effect/turf_decal/stripes/asteroid/corner, /turf/open/floor/plasteel, -/area/construction) -"et" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eu" = ( /obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/plasteel, -/area/construction) -"ev" = ( -/obj/machinery/light{ +/area/hallway/secondary/service) +"ey" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 }, /turf/open/floor/plasteel, -/area/storage/primary) -"ew" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/storage/primary) -"ex" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/storage/primary) -"ey" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 1 - }, -/obj/structure/ladder, -/turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "ez" = ( /obj/machinery/light{ dir = 8 @@ -1403,7 +1407,7 @@ /turf/open/floor/plasteel{ dir = 8 }, -/area/hallway/secondary/entry) +/area/hallway/secondary/service) "eC" = ( /turf/open/openspace, /area/maintenance/department/bridge) @@ -1413,21 +1417,17 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, -/area/engine/engineering) +/area/hallway/secondary/service) "eE" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/plating, -/area/engine/atmos) +/area/hallway/secondary/service) "eF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/engine/atmos) -"eG" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/engineering) +/area/hallway/secondary/service) "eH" = ( /obj/machinery/light{ dir = 4 @@ -1436,126 +1436,61 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eI" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, /turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eJ" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/construction) -"eK" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eL" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, /turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eM" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 4 }, +/obj/machinery/light, /turf/open/floor/plasteel, -/area/construction) +/area/hallway/secondary/service) "eN" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel, -/area/engine/engineering) +/area/hallway/secondary/service) "eO" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, -/area/bridge) -"eP" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eQ" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eR" = ( -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/asteroid/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eS" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eT" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eU" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/area/hallway/secondary/service) "eV" = ( /obj/structure/ladder, /turf/open/floor/plasteel, -/area/hallway/primary/central) -"eW" = ( -/obj/effect/turf_decal/stripes/asteroid/line, +/area/engine/storage) +"fa" = ( /obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 + dir = 1 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eX" = ( -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"eY" = ( -/obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"fk" = ( /obj/machinery/light{ - dir = 8 + dir = 1 }, -/turf/open/floor/plating, -/area/construction) -"fn" = ( -/turf/closed/wall/r_wall, -/area/space) +/turf/open/floor/plasteel, +/area/engine/storage) "fo" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -1566,12 +1501,113 @@ /obj/machinery/door/airlock/external/glass, /obj/structure/fans/tiny, /turf/open/floor/plasteel, -/area/hallway/primary/central) -"og" = ( +/area/engine/storage) +"gK" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + icon_state = "connector_map-2"; + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plating, +/area/construction) +"gW" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"hi" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + icon_state = "inje_map-2"; + dir = 4 + }, +/turf/open/floor/plating, +/area/construction) +"hm" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/ladder, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/construction) +"ho" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/storage) +"ij" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/ce, +/turf/open/floor/plasteel, +/area/construction) +"ip" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"iu" = ( +/turf/open/openspace, +/area/hallway/secondary/service) +"iK" = ( +/turf/open/floor/plasteel{ + dir = 8 + }, +/area/hallway/secondary/service) +"jb" = ( +/obj/machinery/atmospherics/pipe/simple/multiz, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"jA" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/storage) +"jT" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/construction) +"jV" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 6 + }, +/turf/open/floor/plating, +/area/engine/storage) +"kg" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"lu" = ( +/obj/effect/turf_decal/stripes/asteroid/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"mZ" = ( +/turf/open/floor/plasteel{ + dir = 4 + }, +/area/hallway/secondary/service) +"nx" = ( +/turf/open/openspace, +/area/space/nearstation) +"nz" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"od" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/storage) "oh" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -1598,16 +1634,122 @@ /obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/plating, /area/maintenance/department/bridge) -"ux" = ( -/obj/structure/ladder, -/turf/open/floor/plasteel, -/area/security) -"yl" = ( -/obj/structure/cable{ - icon_state = "4-8" +"qo" = ( +/turf/open/openspace, +/area/engine/storage) +"qR" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/storage) +"rd" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/openspace, +/area/engine/storage) +"sh" = ( +/turf/open/floor/plasteel{ + dir = 1 + }, +/area/hallway/secondary/service) +"sm" = ( +/obj/structure/stairs, +/turf/open/floor/plating, +/area/construction) +"sE" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/storage) +"td" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/storage) +"vt" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engine/engineering) +/area/engine/storage) +"vF" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/table, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/construction/rcd/combat/admin, +/turf/open/floor/plasteel, +/area/construction) +"xr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/pipe_dispenser, +/turf/open/floor/plasteel, +/area/construction) +"xB" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/storage) +"xI" = ( +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"zC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/construction) +"zZ" = ( +/obj/structure/disposalpipe/trunk{ + icon_state = "pipe-t"; + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/plating, +/area/construction) +"AG" = ( +/turf/closed/wall/r_wall, +/area/engine/storage) +"AI" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/tank/jetpack/oxygen/captain, +/obj/item/storage/belt/utility/chief/full, +/obj/item/clothing/gloves/color/yellow{ + pixel_y = 10 + }, +/turf/open/floor/plasteel, +/area/construction) +"Bk" = ( +/obj/structure/grille, +/turf/open/openspace, +/area/space/nearstation) "Bm" = ( /obj/machinery/light{ dir = 4 @@ -1617,40 +1759,87 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"CA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/external/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) +"CK" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/turf/open/floor/plating, +/area/hallway/secondary/service) "Dm" = ( /obj/machinery/light{ dir = 1 }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"Fz" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 +"DG" = ( +/obj/machinery/light{ + dir = 4 }, -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plasteel, -/area/security) -"Hn" = ( -/obj/effect/turf_decal/stripes/asteroid/line, -/obj/structure/ladder, -/turf/open/floor/plasteel, +/turf/open/floor/plating, +/area/engine/storage) +"DK" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/storage) +"Eb" = ( +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plating, +/area/engine/storage) +"EF" = ( +/obj/machinery/atmospherics/components/binary/valve, +/turf/open/floor/plating, /area/construction) -"Jz" = ( +"EH" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/storage) +"Fd" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"FL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/hidden{ + icon_state = "pipe11-2"; + dir = 4 + }, +/turf/open/floor/plating, +/area/construction) +"FY" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/construction) +"Hk" = ( +/obj/machinery/atmospherics/pipe/simple/multiz, +/turf/open/floor/plating, +/area/construction) +"IC" = ( +/obj/machinery/atmospherics/components/binary/valve, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"IN" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/turf/open/floor/plasteel, +/area/engine/storage) +"Jt" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, /turf/open/floor/plasteel, -/area/security) +/area/engine/storage) +"JH" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/storage) "Kd" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -1658,30 +1847,26 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"Kq" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, +"Kw" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, +/obj/machinery/light, /turf/open/floor/plasteel, -/area/security) -"KL" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security) +/area/hallway/secondary/service) "KM" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"LE" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/service) "LW" = ( /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -1690,29 +1875,105 @@ /obj/machinery/light, /turf/open/floor/plating, /area/maintenance/department/bridge) -"Pl" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 +"Ob" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/openspace, +/area/space/nearstation) +"Og" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/engine/storage) +"Pu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plasteel, -/area/security) -"Uc" = ( -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plasteel, -/area/security) -"WC" = ( +/turf/open/floor/plating, +/area/engine/storage) +"Pz" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/storage) +"Qo" = ( +/obj/structure/disposalpipe/trunk/multiz/down{ + icon_state = "pipe-down"; + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"Qw" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 }, /turf/open/floor/plasteel, -/area/security) -"YD" = ( +/area/engine/storage) +"St" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/turf/open/floor/plasteel, +/area/construction) +"Tf" = ( +/turf/open/floor/plating, +/area/construction) +"TH" = ( +/turf/open/floor/plating, +/area/engine/storage) +"TY" = ( +/turf/closed/wall/r_wall, +/area/hallway/secondary/service) +"Um" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, /turf/open/floor/plasteel, -/area/security) +/area/engine/storage) +"UH" = ( +/obj/machinery/atmospherics/pipe/simple/multiz, +/turf/open/floor/plating, +/area/engine/storage) +"Vn" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"VB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/meter, +/turf/open/floor/plating, +/area/construction) +"WN" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/service) +"XN" = ( +/turf/open/floor/plating, +/area/hallway/secondary/service) +"Zc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"ZH" = ( +/obj/structure/disposalpipe/trunk/multiz, +/turf/open/floor/plating, +/area/construction) +"ZQ" = ( +/obj/effect/turf_decal/stripes/white/line{ + icon_state = "warningline_white"; + dir = 5 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/storage) (1,1,1) = {" aa @@ -2434,17 +2695,17 @@ al aw aM aZ -bj -bs +aX +bA bB -ca -bO -bO -bO -bO -bO -cO -cW +bE +bE +bE +bE +bE +bE +cN +cD dm dy dy @@ -2455,7 +2716,7 @@ dy dy dy dm -dK +dM cN af ad @@ -2488,27 +2749,27 @@ am ax aw ba -bk +be +bj bt -bC -cb +bN bN bN bC bN bN cP -cX -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn +cE +Tf +Tf +ZH +FY +zZ +Tf +Tf +cR +cR +cR dL cN af @@ -2544,25 +2805,25 @@ aN bb bl ah -bD -cc -bE -bE -cA -bE -bE -cQ -cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn +bx +bL +bL +bL +cg +bL +bL +cz +cF +Tf +Tf +Tf +Tf +Tf +Tf +Tf +cR +Tf +cR dL cN af @@ -2599,24 +2860,24 @@ bc bm ah bE -cc bE bE -cA +bE +ch bE bE cQ cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn +Tf +cN +df +Tf +Tf +Tf +Tf +cR +hi +cR dL cN af @@ -2653,24 +2914,24 @@ aP bn ah bF -cc +bE co bE -cA +ch bE bE cN cY -dn -dn -dn -dn -cN -cN -cN -dn -dn -dn +Tf +Tf +dg +Tf +Tf +Tf +Tf +cR +FL +cR dL cN ME @@ -2707,24 +2968,24 @@ ah ah bu bu -cd +bv bu bu +ci +bL +bL cB -bE -bE -cR -cY -dn -dn -dn -dn -cN -fk -cN -dn -dn -dn +cO +dd +dd +dh +Tf +Tf +Tf +Tf +Tf +gK +Tf dL cN af @@ -2760,25 +3021,25 @@ ag ag ag bu -bG -ce +bD +bO cp cv -cC +cj bE bE cR -og -dn -dn -dn -dn +cY +Tf cN -dn -cN -dn -dn -dn +jT +Tf +Tf +Tf +Tf +Tf +Tf +Tf dL cN af @@ -2810,29 +3071,29 @@ ag ai an ai -aQ +an ai ag bv -bH -cf +bG +bQ eb bv -cD -bE -bE -cR -cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn +ck +bN +bN +zC +hm +EF +VB +Hk +Tf +Tf +Tf +Tf +Tf +sm +Tf dL cN af @@ -2861,33 +3122,33 @@ ab ac ae ag -ai ao -aA -aR -ai +as +aB +as +aV ag bv bI -cf +bQ eb bu -cD +cm bE bE cN cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn -dL +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +ij cN af ad @@ -2917,31 +3178,31 @@ ae ag ag ag -aB +aC ag ag ag bv bJ -cf -eb -cw -cD +bR +bS +ca +cq bE bE cQ cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn -dL +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +St cN af ad @@ -2971,31 +3232,31 @@ ae ac ac ag -aB +aC ag ac ac bv bK -cf +eb eb bu -cD +cm bE bE cQ cY -dn -dn -dn -dn -dn -dn -dn -dn -dn -dn -dL +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +Tf +xr cN af ad @@ -3025,16 +3286,16 @@ ae ac ac aj -dZ +aD aj ac ac bv -bL -cf +bH +eb eb bv -cD +cm bE bE cN @@ -3048,8 +3309,8 @@ dz dz dz dz -do -dM +AI +vF cN ME ad @@ -3079,16 +3340,16 @@ ae ac ac aj -aD +aE aj ac ac bu bM -cg +ec cr bu -cD +cm bE bE cS @@ -3133,20 +3394,20 @@ ad ad aj aj -CA +aF aj aj aj bu bu -ch +bv +bu +bu cs -cs -cE -bO -bO +bE +bE +cS cT -da on dA dl @@ -3187,20 +3448,20 @@ ad af aj ap -yl +aG aS bd bo bw bN -ci +bN ct bN -cF +cu bN bN cU -db +cW dJ dB dl @@ -3241,20 +3502,20 @@ ad af aj aq -aE -aT -be -be -bx -bO -cj -bE -bE -cA +aH +aR +aW +aW +bk +bL +bL +bL +cb +cw bE bE cS -dJ +cX dJ dB dl @@ -3296,19 +3557,19 @@ af aj ar dW -yl +aG bf bp aj bP +bE +bE cc -bE -bE cA bE bE cS -dJ +cX dJ dB dl @@ -3350,19 +3611,19 @@ Dm ak ak ak -aU +aT ak ak -ak -bQ +bs +bL +bE +bE cc -bE -bE cA bE bE cS -de +da dJ dB dl @@ -3402,21 +3663,21 @@ ac ad af ak -as -aG -aV +aA +aQ +aU bg bq ak -bR -cc +bL bE bE -cA -bE -bE -cV -dJ +cd +cx +bL +bL +cC +db dJ dB dl @@ -3457,15 +3718,15 @@ ad af ak at -aH -aW +bh +bh bh br ak -bS +bL +bE +bE cc -bE -bE cA bE bE @@ -3517,9 +3778,9 @@ aI aI ak bT -cc -co bE +co +cc cA bE bE @@ -3571,9 +3832,9 @@ dV dV by by -ck by -cx +by +ce cG by by @@ -3586,7 +3847,7 @@ dE dH dI dB -cS +dl dE dJ dQ @@ -3626,8 +3887,8 @@ dV by bU cl -cy -cy +cl +cf cH cI cJ @@ -5184,34 +5445,34 @@ au au ad af -ah -ah -ah -ah -ah -ah -ah -bA -eg -eg -eg -eg -eg -bA -cN -cN -cN -cN -cN -cN -cN -cN -cN -cN -cN -cN -cN -cN +TY +TY +TY +TY +TY +TY +TY +TY +XN +XN +XN +XN +XN +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY +TY af ad au @@ -5238,34 +5499,34 @@ au au ad Dm -ah -aw -aw +TY +XN +XN eE -aw +XN +dY +dY +WN +dY +dY +dY +dY +dY +WN dY -bA -bE -bE -bE -bE -bE -bE -bE -cN es eI eI +kg eI eI eI eI +kg eI eI -eI -eI -eK -cN +eM +TY ME ad au @@ -5292,34 +5553,34 @@ au au ad af -ah -aw -aw -aw +TY +XN +XN +XN +dY +dY +dY +dY +dY +dY +dY +dY dY dY dY -bE -bE -bE -bE -bE -bE -bE -cN eu -au -au -au -au -au -au -au -au -au -au +CK +gW +Qo +XN +XN +XN +XN +eF +eF +eF eL -cN +TY af ad au @@ -5346,34 +5607,34 @@ au au ad af -ah -aw -aw +TY +XN +XN dX dX dY dY -bE -bE -bE -bE -bE -bE -bE -ep +dY +dY +dY +dY +dY +dY +dY +dY eu -au -au -au -au -au -au -au -au -au -au +XN +XN +XN +XN +XN +XN +XN +eF +iu +eF eL -cN +TY af ad au @@ -5400,34 +5661,34 @@ au au ad af -ah -aw +TY +XN +dY +dY +dY +dY +dY +dY +dY +dY dY dY dY dY dY -bE -bE -bE -bE -bE -bE -bE -ep eu -au -au -au -au -au -au -au -au -au -au +XN +TY +di +XN +XN +XN +XN +eF +iu +eF eL -cN +TY af ad au @@ -5454,34 +5715,34 @@ au au ad af -ah +TY +dY +dY +dY +dY +dY +dY +dY +dY +eN dY dY dY dY dY -ah -bE -bE -co -bE -bE -bE -bE -ep eu -au -au -au -au -cN -cN -cN -au -au -au +XN +XN +dj +XN +XN +XN +XN +eF +eF +eF eL -cN +TY af ad au @@ -5508,34 +5769,34 @@ au au ad ad -ah +TY eF ed ed eF -ah -bu -bu -bv -bu -bu -ek -bE -bE -ep +TY +TY +TY +eF +TY +TY +mZ +dY +dY +dY eu -au -au -au -au -au -av -au -au -au -au -eL -cN +XN +XN +dn +XN +XN +XN +XN +XN +XN +XN +Kw +TY ME ad au @@ -5560,36 +5821,36 @@ au au au au -au -au -au -au -au -au -au -au -bu -ea -ea -eh -bu +Ob +nx +nx +nx +nx +nx +nx +nx +TY +dY +dY +WN +TY em -bE -bE -ep -Hn -au -au -au -au -au -au -au -au -au -au +dY +dY +dY +eu +XN +TY +Fd +XN +XN +XN +XN +XN +XN +XN eL -cN +TY af ad au @@ -5614,36 +5875,36 @@ au au au au -au -au -au -au -au -au -au -au -bv -eb -eb -eb -bv -em -bE -bE -ep +Bk +nx +nx +nx +nx +nx +nx +nx +eF +dY +dY +dY +eF +sh +dY +dY +dY eu -au -au -au -au -au -au -au -au -au -au +XN +XN +jb +LE +IC +jb +XN +XN +iu +XN eL -cN +TY af ad au @@ -5668,36 +5929,36 @@ au au au au -au -au -au -au -au -au -au -au +Bk +nx +nx +nx +nx +nx +nx +nx eO -eb -eb -eb -eb -em -bE -bE -ep +dY +dY +dY +dY +sh +dY +dY +dY eu -au -au -au -au -au -au -au -au -au -au +XN +XN +XN +Zc +XN +XN +XN +XN +XN +XN eL -cN +TY af ad au @@ -5722,36 +5983,36 @@ au au au au -au -au -au -au -au -au -au -au +Bk +nx +nx +nx +nx +nx +nx +nx eO -eb -eb -eb -eb -em -bE -bE -ep +dY +dY +dY +dY +sh +dY +dY +dY eu -au -au -au -au -au -au -au -au -au -au +XN +XN +XN +XN +XN +XN +XN +XN +av +XN eL -cN +TY af ad au @@ -5776,36 +6037,36 @@ au au au au -au -au -au -au -au -au -au -au +Bk +nx +nx +nx +nx +nx +nx +nx eO -eb -eb -eb -eb -em -bE -bE -ep +dY +dY +dY +dY +sh +dY +dY +dY eu -au -au -au -au -au -au -au -au -au -au -eL -cN +XN +XN +XN +XN +XN +XN +XN +XN +XN +XN +Kw +TY ME ad au @@ -5830,23 +6091,23 @@ au au au au -au -au -au -au -au -au -au -au -bv -eb -eb -eb -bv -em -bE -bE -et +Bk +nx +nx +nx +nx +nx +nx +nx +eF +dY +dY +dY +eF +sh +dY +dY +eN ey eJ eJ @@ -5858,8 +6119,8 @@ eJ eJ eJ eH -eM -cN +lu +TY af ad au @@ -5884,36 +6145,36 @@ au au au au -au -au -au -au -au -au -au -au -bu -ec -ec -ei -bu -em -bE -bE -cS -dJ -dJ -dJ -dJ -dJ -dJ -dJ -cS -cS -cS -cS -cS -cS +Bk +nx +nx +nx +nx +nx +nx +nx +TY +dY +dY +eN +TY +sh +dY +dY +TY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +TY +TY +TY af ad au @@ -5940,34 +6201,34 @@ au au ad ad -aj -eG +TY +eF eD eD -eG -aj -bu -bu -bv -bu -bu -em -bE -bE -ev -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -ev -dJ -cS +eF +TY +TY +TY +eF +TY +TY +sh +dY +dY +WN +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +WN +dY +TY af ad au @@ -5994,34 +6255,34 @@ au au ad af -aj -dW -dW -dW -dW -dW -aj -bE -bE -ej -bE -bE -bE -bE -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -cS +TY +dY +dY +dY +dY +dY +dY +dY +dY +WN +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +TY af ad au @@ -6048,34 +6309,34 @@ au au ad af -aj -dW -dW -dW -dW -dW -dW -bE -bE -bE -bE -bE -bE -bE -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -cS +TY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +TY ME ad au @@ -6102,34 +6363,34 @@ au au ad af -aj -dW +TY +dY eN -dW -dW -dW -dW -bE -bE -bE -bE -bE -bE -bE -dJ -dd -dq -dJ -ex -ex -ex -ex -ex -ex -ex -ex -ex -cS +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +eF +eF +eF +eF +eF +eF +eF +eF +eF +TY KM ad au @@ -6156,34 +6417,34 @@ au au ad af -ak -dV -ak -dV -dV -dV -dV -bE -bE -bE -bE -bE -bE -bE -dJ -eq -dr -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +TY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6210,34 +6471,34 @@ au au ad Dm -ak -dV -dV -dV -dV -dV -dV -bE -bE -bE -bE -bE -bE -bE -dJ -df -ds -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6264,34 +6525,34 @@ au au ad af -ak -dV -dV -dV -dV -dV -ak -bE -bE -bE -bE -bE -bE -bE -dJ -dg -dt -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +dY +dY +dY +dY +TY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6318,34 +6579,34 @@ au au ad af -ak -dV -dV -dV -dV -dV -ak -bE -bE -co -bE -bE -bE -bE -dJ -dh -du -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +dY +dY +dY +dY +TY +dY +dY +eN +dY +dY +dY +dY +eN +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6372,34 +6633,34 @@ au au ad af -ak -dV -dV -dV -dV -dV -by -by -by -by -eo -by -by -by -by -er -dv -dJ -ex -au -au -au -aC -cS -au -au -au -au +TY +dY +dY +dY +dY +dY +TY +TY +TY +TY +dY +TY +TY +TY +TY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6426,34 +6687,34 @@ au au ad af -ak -dV -aJ -aK -aL -dV -by +TY +dY +sh +iK +mZ +xI +TY ee -cy +iK ez -cy -cy -cy +iK +iK +iK en -by -dj -dw -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6480,34 +6741,34 @@ au au ad af -ak -dV -aK -dV -bi -dV -by -ef -eo -eo -eo -eo -eo -eo -by -dJ -dJ -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +iK +dY +iK +dY +TY +sh +dY +dY +dY +dY +dY +dY +TY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6534,34 +6795,34 @@ au au ad Dm -ak -dV -aL -aK -aJ -dV -by -ef -eo -eo -eo -eo -eo -eo -by -dJ -dJ -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +mZ +iK +sh +dY +TY +sh +dY +dY +dY +dY +dY +dY +TY +dY +dY +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6588,34 +6849,34 @@ au au ad af -ak -dV -dV -aY -dV -dV -by -ef -eo -eo -cy -eo -eo -eo -by -dJ -ew -dJ -ex -au -au -au -au -au -au -au -au -au +TY +dY +dY +eN +dY +dY +TY +sh +dY +dY +iK +dY +dY +dY +TY +dY +eN +dY +eF +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6642,34 +6903,34 @@ au au ad af -ak -ak -ak -ak -ak -ak -by -by -cz -by -by -by -cz -by -by -cS -cS -cS -cS -au -au -au -au -au -au -au -au -au +TY +TY +TY +TY +TY +TY +TY +TY +XN +XN +XN +XN +XN +TY +TY +TY +TY +TY +TY +iu +iu +iu +iu +iu +iu +iu +iu +iu eC ad au @@ -6705,9 +6966,9 @@ oA af af af -by -cz -by +af +af +af oA af af @@ -6759,9 +7020,9 @@ ad ad ad ad -by -by -by +ad +ad +ad ad ad ad @@ -7883,38 +8144,38 @@ au au au au -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG au au au @@ -7937,38 +8198,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +rd +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -7991,38 +8252,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8045,38 +8306,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8099,38 +8360,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +jV +td +td +td +td +td +td +jA +jA +ZQ +qo +qo +qo +AG au au au @@ -8153,38 +8414,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +xB +DG +TH +TH +TH +TH +TH +DK +qo +od +qo +qo +qo +AG au au au @@ -8207,38 +8468,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +xB +AG +dq +TH +TH +TH +TH +DK +qo +od +qo +qo +qo +AG au au au @@ -8261,38 +8522,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +xB +TH +dr +TH +TH +TH +TH +DK +DK +od +qo +qo +qo +AG au au au @@ -8315,38 +8576,38 @@ au au au au -fn -fn -fn -fn -fn -fn -fn -fn -fn -au -au -au -au -au -au -au -Kq -YD -Fz -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +AG +AG +AG +AG +AG +AG +AG +AG +vt +Um +Um +Um +Um +Um +Um +Um +Um +xB +TH +ds +TH +TH +TH +TH +TH +Pz +Eb +qo +qo +qo +AG au au au @@ -8369,38 +8630,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -Jz -ux -Uc -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +dS +dS +xB +AG +Og +TH +TH +TH +TH +TH +TH +Eb +qo +qo +qo +AG au au au @@ -8423,38 +8684,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -KL -WC -Pl -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +dS +dS +xB +Pz +TH +TH +TH +UH +JH +ho +TH +Eb +qo +qo +qo +AG au au au @@ -8477,38 +8738,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +dS +dS +xB +TH +TH +TH +TH +TH +Pu +TH +TH +Eb +qo +qo +qo +AG au au au @@ -8531,38 +8792,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eP -eT -eT -eT -eT -eT -eW -au -au -au -au -au -au -au -au -au -au -au -fn +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +dS +dS +xB +TH +TH +TH +TH +TH +TH +TH +qo +Eb +qo +qo +qo +AG au au au @@ -8585,38 +8846,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eQ -bE -bE -bE -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +dS +dS +EH +sE +sE +sE +sE +sE +sE +sE +sE +qR +qo +qo +qo +AG au au au @@ -8639,38 +8900,38 @@ au au au au -fn -au -au -au -au -au -au -au -fn -au -au -au -au -eQ -bE -bE -co +AG +nx +nx +nx +nx +nx +nx +nx +ip +Jt +dS +dS +dS +dS +dS +dS +nz eV -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn +dS +IN +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8693,38 +8954,38 @@ au au au au -fn -au -au -au -au -au -au +AG +nx +nx +nx +nx +nx +nx dG fo dS dS dS dS -eR -bE -bE -bA -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn +dS +dS +dS +AG +dS +dS +IN +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8747,38 +9008,38 @@ au au au au -fn -fn -fn -fn -fn -fn -fn -fn -fn -au -au -au -au -eQ -bE -bE +AG +AG +AG +AG +AG +AG +AG +AG +AG +fa +Qw +Qw +Qw +Qw +Qw +Qw ej -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn +Qw +Qw +Vn +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8801,38 +9062,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -eQ -bE -bE -bE -bE -bE -eX -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8855,38 +9116,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -eS -eU -eU -eU -eU -eU -eY -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8909,38 +9170,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -8963,38 +9224,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9017,38 +9278,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9071,38 +9332,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9125,38 +9386,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9179,38 +9440,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9233,38 +9494,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9287,38 +9548,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9341,38 +9602,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9395,38 +9656,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9449,38 +9710,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9503,38 +9764,38 @@ au au au au -fn -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -au -fn +AG +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +qo +AG au au au @@ -9557,38 +9818,38 @@ au au au au -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn -fn +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG +AG au au au @@ -9717,7 +9978,7 @@ aa au au au -aX +au au au au diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index bed557320f..e2df772fef 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -77,6 +77,10 @@ #define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand" //from base of atom/attack_hand(): (mob/user) #define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw" //from base of atom/attack_paw(): (mob/user) #define COMPONENT_NO_ATTACK_HAND 1 //works on all 3. +//This signal return value bitflags can be found in __DEFINES/misc.dm +#define COMSIG_ATOM_INTERCEPT_Z_FALL "movable_intercept_z_impact" //called for each movable in a turf contents on /turf/zImpact(): (atom/movable/A, levels) + + ///////////////// #define COMSIG_ENTER_AREA "enter_area" //from base of area/Entered(): (/area) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 4b76f41c61..b6729dfc6c 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -511,5 +511,10 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S #define VOMIT_TOXIC 1 #define VOMIT_PURPLE 2 +// possible bitflag return values of intercept_zImpact(atom/movable/AM, levels = 1) calls +#define FALL_INTERCEPTED (1<<0) //Stops the movable from falling further and crashing on the ground +#define FALL_NO_MESSAGE (1<<1) //Used to suppress the "[A] falls through [old_turf]" messages where it'd make little sense at all, like going downstairs. +#define FALL_STOP_INTERCEPTING (1<<2) //Used in situations where halting the whole "intercept" loop would be better, like supermatter dusting (and thus deleting) the atom. + //Misc text define. Does 4 spaces. Used as a makeshift tabulator. #define FOURSPACES "    " diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 12f0013ac0..9998aa9126 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -839,4 +839,4 @@ Proc for attack log creation, because really why not return TRUE /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1) - return FALSE \ No newline at end of file + . |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels) \ No newline at end of file diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 89ea95ce4d..bd657fe1e8 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -2,14 +2,17 @@ #define STAIR_TERMINATOR_NO 1 #define STAIR_TERMINATOR_YES 2 +// dir determines the direction of travel to go upwards (due to lack of sprites, currently only 1 and 2 make sense) +// stairs require /turf/open/openspace as the tile above them to work +// multiple stair objects can be chained together; the Z level transition will happen on the final stair object in the chain + /obj/structure/stairs name = "stairs" icon = 'icons/obj/stairs.dmi' icon_state = "stairs" anchored = TRUE - //dir = direction of travel to go upwards - var/force_open_above = FALSE + var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/openspace var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC var/turf/listeningTo @@ -108,7 +111,9 @@ T.ChangeTurf(/turf/open/openspace) /obj/structure/stairs/intercept_zImpact(atom/movable/AM, levels = 1) - return isTerminator() + . = ..() + if(isTerminator()) + . |= FALL_INTERCEPTED | FALL_NO_MESSAGE /obj/structure/stairs/proc/isTerminator() //If this is the last stair in a chain and should move mobs up if(terminator_mode != STAIR_TERMINATOR_AUTOMATIC) diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/openspace/openspace.dm index 7fc9173f65..e68aabcd08 100644 --- a/code/game/turfs/openspace/openspace.dm +++ b/code/game/turfs/openspace/openspace.dm @@ -4,8 +4,6 @@ icon_state = "grey" baseturfs = /turf/open/openspace CanAtmosPassVertical = ATMOS_PASS_YES - plane = FLOOR_OPENSPACE_PLANE - layer = OPENSPACE_LAYER //mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/can_cover_up = TRUE var/can_build_on = TRUE @@ -14,8 +12,10 @@ ..() return TRUE -/turf/open/openspace/Initialize() +/turf/open/openspace/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker . = ..() + plane = FLOOR_OPENSPACE_PLANE + layer = OPENSPACE_LAYER return INITIALIZE_HINT_LATELOAD /turf/open/openspace/LateInitialize() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 1b2ccda82c..d618e457b0 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -141,11 +141,18 @@ /turf/proc/zAirOut(direction, turf/source) return FALSE -/turf/proc/zImpact(atom/movable/A, levels = 1) +/turf/proc/zImpact(atom/movable/A, levels = 1, turf/prev_turf) + var/flags = NONE + var/mov_name = A.name for(var/i in contents) var/atom/thing = i - if(thing.intercept_zImpact(A, levels)) - return FALSE + flags |= thing.intercept_zImpact(A, levels) + if(flags & FALL_STOP_INTERCEPTING) + break + if(prev_turf && !(flags & FALL_NO_MESSAGE)) + prev_turf.visible_message("[mov_name] falls through [prev_turf]!") + if(flags & FALL_INTERCEPTED) + return if(zFall(A, ++levels)) return FALSE A.visible_message("[A] crashes into [src]!") @@ -161,11 +168,10 @@ return FALSE if(!force && (!can_zFall(A, levels, target) || !A.can_zFall(src, levels, target, DOWN))) return FALSE - A.visible_message("[A] falls through [src]!") A.zfalling = TRUE A.forceMove(target) A.zfalling = FALSE - target.zImpact(A, levels) + target.zImpact(A, levels, src) return TRUE /turf/proc/handleRCL(obj/item/twohanded/rcl/C, mob/user) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 06d1812ece..4cbb88fe6b 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -651,7 +651,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) Consume(AM) /obj/machinery/power/supermatter_crystal/intercept_zImpact(atom/movable/AM, levels) + . = ..() Bumped(AM) + . |= FALL_STOP_INTERCEPTING | FALL_INTERCEPTED /obj/machinery/power/supermatter_crystal/proc/Consume(atom/movable/AM) if(isliving(AM))