diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm
index 37630b2560d..5ba89260bd2 100644
--- a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm
+++ b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm
@@ -9172,7 +9172,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/squad_vendor{
+/obj/machinery/squad_vendor/solgov{
density = 0;
pixel_y = -32
},
@@ -30379,7 +30379,7 @@
/turf/open/floor/carpet/ship/blue,
/area/medical/patients_rooms/room_a)
"tLG" = (
-/obj/machinery/squad_vendor{
+/obj/machinery/squad_vendor/solgov{
density = 0;
pixel_y = 26
},
@@ -31015,7 +31015,7 @@
/turf/open/floor/carpet/ship,
/area/crew_quarters/cafeteria)
"ujB" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/camera/autoname{
dir = 1
},
diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm
index d8dc782f14e..801b9b75cd1 100644
--- a/_maps/map_files/Atlas/atlas.dmm
+++ b/_maps/map_files/Atlas/atlas.dmm
@@ -74,7 +74,7 @@
/obj/effect/landmark/start/warden,
/obj/structure/chair/stool,
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"al" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/durasteel/techfloor,
@@ -150,8 +150,10 @@
/turf/open/floor/plasteel/techmaint,
/area/quartermaster/miningoffice)
"au" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/durasteel/techfloor_grid,
/area/security/prison)
"av" = (
@@ -177,9 +179,6 @@
/turf/open/floor/plasteel/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
"ax" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
/obj/structure/cable{
icon_state = "1-4"
},
@@ -265,6 +264,9 @@
dir = 4
},
/obj/structure/extinguisher_cabinet/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"aP" = (
@@ -302,7 +304,7 @@
},
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
"aY" = (
/obj/effect/turf_decal/tile/ship/half/green{
dir = 8
@@ -493,7 +495,7 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
"bB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -538,7 +540,7 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"bJ" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -582,6 +584,10 @@
codes_txt = "patrol;next_patrol=hmain2";
location = "hmain1"
},
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"bX" = (
@@ -614,6 +620,13 @@
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
+"ch" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"cj" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/ship/techfloor{
@@ -662,13 +675,13 @@
/turf/open/floor/plating,
/area/engine/atmos)
"ct" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"cv" = (
@@ -701,7 +714,7 @@
pixel_y = 26
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"cx" = (
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
@@ -785,7 +798,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"cH" = (
/obj/structure/grille/wall,
/turf/open/floor/engine/airless,
@@ -806,7 +819,7 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"cQ" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -934,7 +947,7 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"dp" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/ship/half/blue{
@@ -990,7 +1003,7 @@
pixel_y = 26
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"dv" = (
/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/dark,
@@ -1071,7 +1084,7 @@
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"dJ" = (
/obj/effect/turf_decal/tile/ship/half/red{
dir = 8
@@ -1082,7 +1095,7 @@
/obj/item/poster/random_contraband,
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"dK" = (
/obj/machinery/computer/deckgun,
/obj/effect/turf_decal/stripes/line{
@@ -1121,12 +1134,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"dS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -1152,7 +1165,7 @@
dir = 1
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"dU" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden{
dir = 4
@@ -1211,7 +1224,19 @@
/obj/item/reagent_containers/spray/cleaner,
/obj/item/clothing/mask/surgical,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
+"ed" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
"ef" = (
/obj/effect/turf_decal/tile/ship/green{
dir = 4
@@ -1226,11 +1251,11 @@
/obj/machinery/iv_drip,
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"ei" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/plasteel/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
@@ -1282,12 +1307,12 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/science)
"eq" = (
@@ -1367,6 +1392,13 @@
/obj/item/rcl/pre_loaded,
/turf/open/floor/carpet/orange,
/area/engine/engine_room)
+"eC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"eD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1378,6 +1410,19 @@
icon_state = "panelscorched"
},
/area/maintenance/department/engine/atmos)
+"eE" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"eF" = (
/obj/machinery/atmospherics/components/trinary/mixer/layer4{
dir = 8
@@ -1451,7 +1496,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"eX" = (
/obj/machinery/atmospherics/components/trinary/mixer/layer4{
dir = 8
@@ -1471,10 +1516,10 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"fb" = (
@@ -1597,9 +1642,6 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"ft" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -1670,6 +1712,13 @@
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
+"fA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"fB" = (
/obj/structure/chair{
dir = 4
@@ -1769,7 +1818,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
"fV" = (
/obj/effect/turf_decal/tile/ship/half/red{
dir = 4
@@ -1778,7 +1827,7 @@
icon_state = "4-8"
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"fW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1793,7 +1842,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"fZ" = (
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma{
@@ -1844,18 +1893,18 @@
/obj/machinery/computer/ship/viewscreen,
/obj/machinery/recharger,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"gc" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"gd" = (
@@ -1889,7 +1938,7 @@
/obj/machinery/airalarm/directional/north,
/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"gh" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1901,7 +1950,7 @@
"gi" = (
/obj/machinery/vending/security,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"gk" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -1955,6 +2004,12 @@
/area/engine/engine_room)
"gq" = (
/obj/machinery/advanced_airlock_controller/directional/north,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"gs" = (
@@ -1985,6 +2040,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"gx" = (
@@ -2079,7 +2137,7 @@
},
/obj/machinery/recharger,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"gN" = (
/obj/structure/shuttle/engine/huge{
dir = 8
@@ -2105,6 +2163,12 @@
},
/turf/open/floor/monotile/dark,
/area/ai_monitored/security/armory)
+"gQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
"gS" = (
/turf/open/floor/engine/airless,
/area/space/nearstation)
@@ -2231,7 +2295,7 @@
},
/obj/machinery/flasher/portable,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"hn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2250,7 +2314,7 @@
dir = 6
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"ho" = (
/obj/structure/closet/radiation,
/turf/open/floor/plating,
@@ -2288,7 +2352,7 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"hr" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -2297,6 +2361,9 @@
dir = 8
},
/obj/effect/turf_decal/tile/ship/yellow,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"ht" = (
@@ -2473,6 +2540,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/science)
"hX" = (
@@ -2605,7 +2675,7 @@
},
/obj/effect/landmark/start/security_officer,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"iz" = (
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
@@ -2613,7 +2683,7 @@
/obj/structure/closet/secure_closet/warden,
/obj/machinery/status_display/ai/east,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"iA" = (
/obj/machinery/computer/ship/munitions_computer/west{
dir = 4
@@ -2838,7 +2908,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"jn" = (
/obj/machinery/requests_console{
department = "Cargo Bay";
@@ -3053,7 +3123,7 @@
/area/engine/atmos)
"jQ" = (
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"jS" = (
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
@@ -3079,10 +3149,14 @@
/turf/open/floor/monotile/dark,
/area/engine/engine_room)
"jX" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/chair/office{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"jY" = (
@@ -3092,7 +3166,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"jZ" = (
@@ -3159,7 +3232,7 @@
/obj/structure/chair/stool,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"kl" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -3304,7 +3377,6 @@
/area/chapel/main)
"kA" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "4-8"
@@ -3316,6 +3388,7 @@
id = "deck2_brig";
next_id = "deck2_ladder"
},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"kB" = (
@@ -3467,6 +3540,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/science)
"kW" = (
@@ -3802,6 +3878,9 @@
codes_txt = "patrol;next_patrol=hmains2";
location = "hsouth2"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"lO" = (
@@ -3889,7 +3968,7 @@
/obj/structure/closet/secure_closet/security/sec,
/obj/item/book/granter/martial/jujitsu,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"mj" = (
/turf/open/floor/plating,
/area/engine/atmos)
@@ -3981,21 +4060,22 @@
/turf/open/floor/monotile/steel,
/area/engine/engine_room)
"mz" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"mC" = (
/turf/open/floor/monotile/steel,
/area/quartermaster/storage)
"mD" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -4008,6 +4088,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"mE" = (
@@ -4237,7 +4318,6 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
"nw" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
@@ -4247,6 +4327,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"nx" = (
@@ -4479,8 +4560,8 @@
/obj/effect/turf_decal/pool{
dir = 1
},
-/obj/effect/landmark/start/depsec/engineering,
/obj/machinery/light_switch/east,
+/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/monotile/steel,
/area/engine/engine_room)
"oi" = (
@@ -4567,7 +4648,7 @@
},
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
"ot" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/tank_dispenser/oxygen,
@@ -4659,7 +4740,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/science)
"oI" = (
@@ -4689,7 +4772,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"oQ" = (
/obj/structure/ladder,
/obj/effect/turf_decal/tile/ship/half/green{
@@ -4712,16 +4795,11 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
"oS" = (
-/obj/item/organ/body_egg/alien_embryo{
- layer = 2.35
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
},
-/turf/open/floor/wood,
-/area/crew_quarters/abandoned_gambling_den{
- name = "Abandoned Bar"
- })
+/turf/open/floor/durasteel/techfloor_grid,
+/area/security/prison)
"oU" = (
/turf/closed/wall/steel,
/area/hallway/secondary/exit/departure_lounge)
@@ -4804,18 +4882,6 @@
"pd" = (
/obj/item/paper_bin/construction,
/obj/item/pen/fountain,
-/obj/machinery/button/door{
- id = "gaussgang_atlas";
- name = "public gauss access";
- pixel_y = 32;
- req_one_access_txt = "69"
- },
-/obj/machinery/button/door{
- id = "muni_atlas";
- name = "public munitions access";
- pixel_y = 24;
- req_one_access_txt = "69"
- },
/obj/structure/closet/secure_closet/master_at_arms,
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -4895,12 +4961,12 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"po" = (
@@ -4925,7 +4991,7 @@
"pp" = (
/obj/structure/chair/office,
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"pq" = (
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/machinery/door/firedoor/border_only,
@@ -4959,10 +5025,6 @@
/turf/open/floor/plating,
/area/maintenance/department/engine/atmos)
"pw" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hmains4";
location = "hmains2"
@@ -4970,8 +5032,11 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
},
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
@@ -5198,9 +5263,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"qc" = (
@@ -5235,8 +5298,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/monotile/dark,
/area/science)
@@ -5280,15 +5343,9 @@
/turf/open/floor/engine,
/area/quartermaster/storage)
"qo" = (
-/obj/effect/turf_decal/tile/ship/half/green,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck2/primary)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/grid/steel,
+/area/hallway/secondary/exit/departure_lounge)
"qp" = (
/obj/machinery/light/small{
dir = 1
@@ -5317,7 +5374,7 @@
},
/obj/effect/landmark/start/security_officer,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"qx" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -5355,6 +5412,9 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"qI" = (
@@ -5445,9 +5505,6 @@
dir = 1
},
/obj/machinery/door/firedoor/border_only,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/landmark/zebra_interlock_point,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
@@ -5630,10 +5687,17 @@
},
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss/battery/deck2/port)
-"rH" = (
-/obj/structure/cable{
- icon_state = "1-2"
+"rG" = (
+/obj/effect/turf_decal/tile/ship/half/green,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
},
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
+"rH" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -5781,12 +5845,6 @@
/turf/open/floor/plating,
/area/nsv/weapons)
"rZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
/obj/structure/disposalpipe/segment{
dir = 10
},
@@ -5845,6 +5903,14 @@
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/starboard)
+"sk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"sl" = (
/obj/machinery/door/airlock/ship/maintenance,
/obj/machinery/door/firedoor/border_only{
@@ -5942,12 +6008,13 @@
},
/obj/effect/turf_decal/tile/ship/red,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"sJ" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/science)
"sL" = (
@@ -5975,9 +6042,6 @@
},
/area/maintenance/nsv/deck2/starboard)
"sQ" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -5985,6 +6049,9 @@
/obj/effect/turf_decal/tile/ship/green{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"sR" = (
@@ -6072,10 +6139,12 @@
/obj/effect/turf_decal/tile/orange{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/camera/autoname{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/durasteel/alt,
/area/nsv/weapons/gauss/battery/deck2/port)
"ti" = (
@@ -6127,13 +6196,16 @@
name = "Isolation"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/effect/landmark/zebra_interlock_point,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/dark,
/area/security/brig)
"tr" = (
@@ -6174,7 +6246,7 @@
dir = 1
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"tt" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -6284,6 +6356,22 @@
},
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss/battery/deck2/port)
+"tH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"tJ" = (
/obj/structure/chair,
/turf/open/floor/plating{
@@ -6304,7 +6392,7 @@
dir = 1
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"tN" = (
/obj/effect/turf_decal/tile/ship/half/green,
/obj/effect/turf_decal/tile/ship/green{
@@ -6327,6 +6415,13 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/quartermaster/storage)
+"tS" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/monotile/dark,
+/area/science)
"tT" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light_switch/east,
@@ -6341,7 +6436,6 @@
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"tZ" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
@@ -6351,15 +6445,15 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"ua" = (
/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/steel,
/area/science)
"ub" = (
@@ -6437,7 +6531,7 @@
/obj/effect/landmark/start/security_officer,
/obj/structure/chair/stool,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"uk" = (
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/machinery/door/firedoor/border_only,
@@ -6461,7 +6555,7 @@
},
/obj/machinery/disposal/bin,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"un" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6478,6 +6572,9 @@
/obj/structure/sign/warning/enginesafety{
pixel_y = 26
},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"uq" = (
@@ -6511,15 +6608,13 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/quartermaster/storage)
"ut" = (
@@ -6540,7 +6635,7 @@
dir = 8
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"uv" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6699,7 +6794,6 @@
/turf/open/floor/carpet/royalblack,
/area/chapel/main)
"uP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/tile/ship/half/red{
dir = 1
},
@@ -6965,9 +7059,15 @@
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"vO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/durasteel/techfloor_grid,
-/area/security/prison)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
"vR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7078,6 +7178,12 @@
"wd" = (
/turf/closed/wall/steel,
/area/maintenance/nsv/deck2/port)
+"wf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
"wh" = (
/obj/machinery/light{
dir = 8
@@ -7086,6 +7192,9 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons/gauss/battery/deck2/port)
"wk" = (
@@ -7182,15 +7291,18 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/layer_manifold{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/sign/warning/enginesafety{
pixel_y = 26
},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"wG" = (
@@ -7251,12 +7363,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/quartermaster/storage)
"wQ" = (
@@ -7280,12 +7390,8 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/door/airlock/ship/external/glass{
name = "Pressurization Chamber";
req_one_access_txt = "79"
@@ -7427,7 +7533,7 @@
dir = 8
},
/turf/open/floor/durasteel/alt,
-/area/security/brig)
+/area/security/main)
"xs" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -7471,6 +7577,10 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/monotile/dark,
/area/ai_monitored/security/armory)
+"xC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons)
"xD" = (
/obj/machinery/computer/ship/dradis/minor{
dir = 8
@@ -7506,7 +7616,7 @@
},
/obj/effect/landmark/start/brig_physician,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"xI" = (
/obj/structure/cable{
icon_state = "2-8";
@@ -7777,10 +7887,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hsouth1";
location = "hmains1"
@@ -7792,6 +7898,11 @@
id = "deck2_munitions";
next_id = "deck2_eva"
},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"yF" = (
@@ -7825,22 +7936,20 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=sci";
location = "hsouth1"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"yM" = (
@@ -7926,8 +8035,11 @@
/turf/open/floor/engine/o2,
/area/engine/atmos)
"za" = (
-/turf/open/floor/monotile/steel,
-/area/ai_monitored/security/armory)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
"zc" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
dir = 4
@@ -8003,6 +8115,12 @@
})
"zk" = (
/obj/machinery/light,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"zl" = (
@@ -8172,14 +8290,17 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
+"zT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/grid/steel,
+/area/hallway/secondary/exit/departure_lounge)
"zU" = (
/obj/structure/table/reinforced,
/obj/item/lighter,
@@ -8258,11 +8379,17 @@
/turf/open/floor/monotile/dark,
/area/science)
"Ae" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
-/turf/open/floor/plasteel/grid/steel,
-/area/hallway/secondary/exit/departure_lounge)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
"Aj" = (
/obj/structure/railing,
/obj/effect/turf_decal/ship/delivery/yellow,
@@ -8306,6 +8433,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"Ap" = (
@@ -8326,6 +8454,15 @@
},
/turf/open/floor/monotile/steel,
/area/hallway/secondary/exit/departure_lounge)
+"Av" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/security/prison)
"Ax" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -8356,6 +8493,18 @@
/obj/machinery/door/airlock/ship/maintenance/defaultaccess,
/turf/open/floor/monotile/steel,
/area/maintenance/nsv/deck2/port/fore)
+"AG" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/nsv/weapons)
"AI" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -8420,6 +8569,26 @@
/obj/machinery/power/tracker,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"AX" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
+"AZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/monotile/steel,
+/area/engine/engine_room)
"Ba" = (
/obj/effect/turf_decal/tile/ship/half/yellow,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -8451,9 +8620,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -8535,14 +8701,12 @@
/turf/open/floor/carpet/ship/beige_carpet,
/area/quartermaster/qm)
"By" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
},
-/turf/open/floor/monotile/steel,
-/area/engine/engine_room)
+/turf/open/floor/engine,
+/area/quartermaster/storage)
"BC" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -8601,14 +8765,15 @@
},
/turf/open/floor/engine,
/area/engine/engine_room)
+"BL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/ai_monitored/security/armory)
"BM" = (
/obj/machinery/firealarm{
dir = 4;
pixel_x = -26
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -8616,6 +8781,9 @@
/obj/effect/turf_decal/tile/ship/green{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"BN" = (
@@ -8664,9 +8832,10 @@
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"BX" = (
@@ -8836,16 +9005,19 @@
/turf/open/floor/monotile/steel,
/area/hallway/secondary/exit/departure_lounge)
"CA" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/monotile/dark,
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"CC" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/monotile/steel,
/area/hallway/secondary/exit/departure_lounge)
@@ -8872,9 +9044,12 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/plasteel/ridged/steel,
/area/hallway/nsv/deck2/primary)
"CG" = (
@@ -9073,6 +9248,13 @@
"Dy" = (
/turf/closed/wall/r_wall,
/area/quartermaster/qm)
+"DC" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/monotile/dark,
+/area/science)
"DD" = (
/obj/machinery/light/small{
brightness = 3;
@@ -9099,6 +9281,18 @@
"DH" = (
/turf/closed/wall/r_wall,
/area/quartermaster/miningoffice)
+"DK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/science)
"DM" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -9112,6 +9306,16 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
+"DN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck2/primary)
"DT" = (
/obj/effect/turf_decal/loading_area{
dir = 4
@@ -9127,23 +9331,35 @@
/turf/open/floor/monotile/steel,
/area/nsv/weapons/gauss/battery/deck2/starboard)
"DV" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"DX" = (
-/obj/structure/overmap/small_craft/combat/light,
-/obj/machinery/light,
-/turf/open/floor/plasteel/techmaint{
- initial_gas_mix = "TEMP=2.7"
+/obj/machinery/button/door{
+ id = "muni_atlas";
+ name = "public munitions access";
+ pixel_y = 24;
+ req_one_access_txt = "69"
},
-/area/nsv/hanger/notkmcstupidhanger)
+/obj/machinery/button/door{
+ id = "gaussgang_atlas";
+ name = "public gauss access";
+ pixel_y = 32;
+ req_one_access_txt = "69"
+ },
+/obj/item/tank/internals/oxygen,
+/obj/machinery/suit_storage_unit/maa,
+/turf/open/floor/carpet/ship,
+/area/nsv/weapons)
"DZ" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -9166,7 +9382,7 @@
"Ea" = (
/obj/machinery/holopad,
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"Eb" = (
/obj/machinery/door/airlock/ship/external/glass{
req_one_access_txt = "31; 48";
@@ -9187,9 +9403,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -9223,6 +9436,10 @@
/obj/structure/toilet{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/auto_name/north,
/turf/open/floor/monotile/steel,
/area/security/brig)
"Ej" = (
@@ -9239,6 +9456,11 @@
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/space/nearstation)
+"El" = (
+/obj/item/control_rod,
+/obj/item/control_rod,
+/turf/open/indestructible/sound/pool/spentfuel,
+/area/engine/engine_room)
"Eo" = (
/obj/machinery/door/poddoor/shutters/ship{
id = "gaussgang_atlas";
@@ -9264,7 +9486,7 @@
dir = 1
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Et" = (
/obj/structure/shuttle/engine/huge{
dir = 8
@@ -9275,6 +9497,7 @@
/obj/structure/rack,
/obj/item/clothing/ears/earmuffs,
/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"Ex" = (
@@ -9574,6 +9797,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"FL" = (
@@ -9642,7 +9866,7 @@
},
/obj/effect/landmark/start/lawyer,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"FU" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -9712,6 +9936,9 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
+"Gg" = (
+/turf/closed/wall/r_wall,
+/area/security/main)
"Gh" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
@@ -9742,9 +9969,6 @@
/area/space/nearstation)
"Gj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
/obj/structure/disposalpipe/sorting/mail{
dir = 8;
sortType = 6
@@ -9752,6 +9976,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"Gk" = (
@@ -9822,6 +10047,12 @@
},
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
+"Gv" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"Gw" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/light_switch/west,
@@ -9835,6 +10066,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/monotile/steel,
/area/science)
"GA" = (
@@ -10314,12 +10548,17 @@
/obj/machinery/deck_turret/payload_gate,
/turf/open/floor/plating,
/area/nsv/weapons)
+"Ih" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons)
"Ii" = (
/obj/machinery/computer/crew{
dir = 8
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Il" = (
/obj/machinery/door/airlock/ship/external/glass{
req_one_access_txt = "24"
@@ -10336,13 +10575,13 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port)
"Im" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
/obj/machinery/meter/atmos{
target_layer = 4;
name = "Scrubber loop gas flow meter"
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/engine/atmos)
"In" = (
@@ -10382,13 +10621,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/light,
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"IE" = (
@@ -10486,13 +10725,15 @@
},
/area/nsv/hanger/notkmcstupidhanger)
"Je" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 4
},
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
+ dir = 8
},
-/turf/open/floor/monotile/steel,
+/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck2/primary)
"Jf" = (
/obj/structure/ladder,
@@ -10545,6 +10786,19 @@
},
/turf/open/floor/circuit/telecomms,
/area/science)
+"Jj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/ship/brown,
+/obj/effect/turf_decal/tile/ship/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck2/primary)
"Jk" = (
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
@@ -10555,7 +10809,6 @@
/obj/effect/turf_decal/tile/orange{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/durasteel/alt,
/area/nsv/weapons/gauss/battery/deck2/port)
@@ -10671,7 +10924,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"JB" = (
/obj/structure/sign/departments/minsky/research/xenobiology,
/turf/closed/wall/r_wall,
@@ -10680,6 +10933,9 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"JD" = (
@@ -10707,21 +10963,21 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/starboard)
"JF" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
/obj/machinery/door/airlock/ship/external/glass{
name = "Pressurization Chamber";
req_one_access_txt = "79"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
},
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
@@ -10750,21 +11006,21 @@
},
/obj/machinery/light,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"JN" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"JO" = (
@@ -10792,6 +11048,9 @@
"JR" = (
/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"JS" = (
@@ -10800,7 +11059,7 @@
icon_state = "0-8"
},
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
"JT" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -10996,7 +11255,7 @@
dir = 4
},
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"Kw" = (
/turf/open/floor/durasteel/techfloor_grid,
/area/security/prison)
@@ -11035,7 +11294,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"KF" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
dir = 1
@@ -11103,8 +11362,8 @@
/obj/effect/turf_decal/tile/orange{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
/turf/open/floor/durasteel/alt,
/area/nsv/weapons/gauss/battery/deck2/port)
@@ -11153,6 +11412,9 @@
/obj/machinery/camera/autoname{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
/turf/open/floor/monotile/steel,
/area/security/brig)
"KX" = (
@@ -11241,6 +11503,18 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
+"Lf" = (
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck2/primary)
"Li" = (
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/machinery/door/firedoor/border_only,
@@ -11375,12 +11649,12 @@
dir = 8
},
/obj/machinery/advanced_airlock_controller/directional/north,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"LD" = (
@@ -11468,7 +11742,7 @@
dir = 8
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"LR" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -11601,6 +11875,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"Mi" = (
@@ -12062,13 +12339,16 @@
/turf/open/floor/monotile/steel,
/area/engine/engine_room)
"NR" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
},
/obj/machinery/door/airlock/ship/external/glass{
name = "Pressurization Chamber";
req_one_access_txt = "79"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"NT" = (
@@ -12091,7 +12371,7 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"NW" = (
/obj/machinery/computer/ship/munitions_computer/west,
/turf/open/floor/monotile/steel,
@@ -12288,7 +12568,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Ov" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/vending/sovietsoda,
@@ -12449,12 +12729,13 @@
})
"OV" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"OW" = (
@@ -12487,10 +12768,10 @@
/turf/template_noop,
/area/maintenance/nsv/deck2/port)
"Pd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/monotile/steel,
@@ -12558,18 +12839,18 @@
/turf/closed/wall/r_wall,
/area/nsv/hanger/mining)
"Pp" = (
-/obj/effect/turf_decal/tile/ship/green,
-/obj/effect/turf_decal/tile/ship/green{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/turf/open/floor/durasteel/alt,
-/area/hallway/nsv/deck2/primary)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/lattice/catwalk/over/ship,
+/turf/open/floor/monotile/steel,
+/area/nsv/weapons)
"Pq" = (
/obj/machinery/camera/autoname,
/obj/structure/rack,
@@ -12686,7 +12967,13 @@
/turf/open/floor/plasteel/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
"PO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/monotile/steel,
/area/security/brig)
"PP" = (
@@ -12742,16 +13029,16 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"PV" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"PX" = (
@@ -12917,7 +13204,7 @@
dir = 4
},
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"Qx" = (
/obj/item/beacon,
/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{
@@ -13120,6 +13407,18 @@
},
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss/battery/deck2/port)
+"Rc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/science)
"Rf" = (
/obj/machinery/light/small{
dir = 4
@@ -13131,7 +13430,7 @@
dir = 1
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Rh" = (
/obj/structure/chair/office{
dir = 8
@@ -13189,6 +13488,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/engine/engine_room)
"Rq" = (
@@ -13335,9 +13637,12 @@
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger/notkmcstupidhanger)
"RJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/turf_decal/pool{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/engine/engine_room)
"RK" = (
@@ -13389,6 +13694,12 @@
/turf/open/floor/monotile/steel,
/area/nsv/weapons/gauss/battery/deck2/starboard)
"RV" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -13396,9 +13707,6 @@
name = "Pressurization Chamber";
req_one_access_txt = "79"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"RW" = (
@@ -13433,7 +13741,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"RZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13451,12 +13759,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"Se" = (
@@ -13480,6 +13786,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/landmark/zebra_interlock_point,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"Si" = (
@@ -13498,7 +13807,7 @@
dir = 4
},
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Sj" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
@@ -13633,7 +13942,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
/turf/open/floor/monotile/steel,
/area/science)
"SP" = (
@@ -13686,7 +13998,7 @@
},
/obj/structure/table/reinforced,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"SX" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -13827,7 +14139,7 @@
"Tq" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"Tt" = (
/obj/machinery/door/airlock/ship/maintenance/defaultaccess{
name = "EVA";
@@ -13964,6 +14276,9 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"TL" = (
@@ -14002,7 +14317,7 @@
dir = 8
},
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"TS" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -14104,6 +14419,9 @@
/turf/open/floor/plating,
/area/engine/atmos)
"Uc" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"Uf" = (
@@ -14123,6 +14441,7 @@
"Ug" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/monotile/dark,
/area/security/brig)
"Ul" = (
@@ -14136,7 +14455,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/plasteel/techmaint,
-/area/security/brig)
+/area/security/main)
"Um" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -14393,6 +14712,9 @@
/area/maintenance/nsv/deck2/port/fore)
"Vc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"Vd" = (
@@ -14613,10 +14935,12 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck2/primary)
"VM" = (
@@ -14758,7 +15082,6 @@
/turf/open/floor/monotile/steel,
/area/nsv/weapons/gauss/battery/deck2/starboard)
"Wk" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/camera/autoname,
/obj/effect/turf_decal/tile/ship/red{
dir = 1
@@ -14778,7 +15101,7 @@
},
/obj/machinery/light_switch/west,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Wn" = (
/obj/machinery/suit_storage_unit/security,
/obj/effect/turf_decal/tile/ship/half/red{
@@ -14790,13 +15113,11 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/science)
"Wr" = (
@@ -14871,6 +15192,12 @@
},
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
+"WF" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/engine/atmos)
"WH" = (
/obj/effect/turf_decal/tile/ship/half/green{
dir = 1
@@ -14907,7 +15234,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/dark,
-/area/security/brig)
+/area/security/main)
"WT" = (
/obj/machinery/conveyor{
dir = 4;
@@ -14916,9 +15243,8 @@
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"WW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
@@ -14927,7 +15253,8 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 1
+ dir = 8;
+ piping_layer = 4
},
/obj/structure/cable{
icon_state = "1-2"
@@ -14984,6 +15311,8 @@
/obj/structure/disposaloutlet{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"Xl" = (
@@ -14991,7 +15320,7 @@
name = "Munitions Department"
},
/turf/closed/wall/r_wall,
-/area/security/brig)
+/area/security/main)
"Xn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -15101,6 +15430,7 @@
/obj/item/clothing/ears/earmuffs,
/obj/item/clothing/ears/earmuffs,
/obj/machinery/light,
+/obj/item/clothing/ears/earmuffs,
/turf/open/floor/monotile/dark,
/area/nsv/weapons)
"XG" = (
@@ -15259,7 +15589,7 @@
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Yh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -15394,6 +15724,10 @@
/obj/machinery/rnd/production/techfab/department/munitions,
/turf/open/floor/carpet/red,
/area/nsv/weapons)
+"YL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/ridged/steel,
+/area/hallway/nsv/deck2/primary)
"YM" = (
/obj/effect/turf_decal/tile/ship/green{
dir = 4
@@ -15425,16 +15759,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/layer_manifold{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/plasteel/techmaint,
/area/nsv/weapons)
"YS" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/main)
"YT" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
@@ -15450,9 +15787,6 @@
/turf/open/floor/monotile/steel,
/area/nsv/weapons)
"YW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -15460,6 +15794,18 @@
/obj/structure/munitions_trolley,
/turf/open/floor/engine,
/area/quartermaster/storage)
+"YX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/nsv/weapons)
"YZ" = (
/obj/effect/turf_decal/ship/delivery/yellow,
/obj/machinery/door/firedoor/border_only,
@@ -15510,7 +15856,7 @@
},
/obj/machinery/rnd/production/techfab/department/security,
/turf/open/floor/monotile/steel,
-/area/security/brig)
+/area/security/main)
"Zh" = (
/obj/machinery/particle_accelerator/control_box,
/obj/effect/turf_decal/stripes/line{
@@ -15671,7 +16017,7 @@
dir = 10
},
/turf/open/floor/carpet/red,
-/area/security/brig)
+/area/security/main)
"ZK" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/med/surgery,
@@ -15736,6 +16082,10 @@
/area/nsv/weapons)
"ZT" = (
/obj/machinery/smartfridge/extract/preloaded,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
/turf/closed/wall/r_wall,
/area/science)
"ZW" = (
@@ -42622,7 +42972,7 @@ MO
qe
wW
Sl
-Sl
+AZ
Sl
nx
of
@@ -43136,7 +43486,7 @@ MO
cB
lK
mH
-Rr
+RJ
Yy
nB
ul
@@ -43392,13 +43742,13 @@ yI
YQ
fP
lK
-mH
+El
Rr
Zh
mM
ul
-By
-RJ
+lL
+oz
NI
MO
YQ
@@ -43649,7 +43999,7 @@ qK
qI
oF
lK
-mH
+El
Rr
ZH
VQ
@@ -44159,7 +44509,7 @@ YQ
YQ
vs
sG
-dQ
+Pd
jl
oF
oF
@@ -44420,7 +44770,7 @@ Pd
Cq
YF
gX
-jt
+Lf
Or
TN
vm
@@ -44430,7 +44780,7 @@ Us
jt
uk
rS
-Je
+Mh
ao
qI
rr
@@ -44677,12 +45027,12 @@ ko
vd
lu
zY
-zY
+vd
zY
zY
Tw
zY
-zY
+vO
zY
wG
lu
@@ -44939,7 +45289,7 @@ am
ps
tm
kL
-kL
+Je
uq
mv
YZ
@@ -45719,9 +46069,9 @@ un
NC
ew
Nr
-wx
-wx
-wx
+gQ
+YL
+za
PA
ks
gl
@@ -45955,8 +46305,8 @@ Hu
Gs
wd
ie
+Jk
Tm
-Vc
ju
SX
ny
@@ -45978,7 +46328,7 @@ xt
qb
CF
Mj
-wx
+wf
sp
YQ
Ie
@@ -46472,7 +46822,7 @@ wd
wd
jE
rf
-un
+ed
aM
zI
KB
@@ -47257,8 +47607,8 @@ jh
UZ
RN
oY
-pn
-qo
+rB
+rG
qi
hP
rL
@@ -47514,8 +47864,8 @@ YT
Ob
RN
YM
-rB
-Pp
+un
+Ef
qI
al
rT
@@ -48542,7 +48892,7 @@ YT
bY
RN
FI
-wq
+AX
TG
xE
MA
@@ -48785,7 +49135,7 @@ dC
dC
MZ
Ao
-un
+DN
Ef
RN
ZF
@@ -49544,19 +49894,19 @@ wl
wl
wl
wl
-WN
+Gg
bA
-WN
-WN
+Gg
+Gg
xr
fU
fU
-WN
-WN
-WN
-WN
+Gg
+Gg
+Gg
+Gg
Wk
-SX
+un
Yv
RN
yZ
@@ -49570,7 +49920,7 @@ YT
SK
RN
sR
-un
+Ae
gv
tN
IW
@@ -49584,7 +49934,7 @@ JT
PM
em
ei
-Ae
+Vj
Vj
SF
Ni
@@ -49813,7 +50163,7 @@ Ou
Si
YS
uP
-tk
+pn
Ss
RN
rh
@@ -49842,7 +50192,7 @@ zA
dd
Zl
Vj
-Vj
+qo
CC
Qe
kv
@@ -50055,7 +50405,7 @@ ga
LU
wl
fG
-vO
+Kw
au
vV
Ul
@@ -50077,7 +50427,7 @@ RN
RN
OK
Im
-mj
+WF
HW
nz
RN
@@ -50099,7 +50449,7 @@ bg
pm
gH
lC
-lC
+zT
Cz
Ni
Ni
@@ -50313,19 +50663,19 @@ LU
wl
kB
aC
-aC
+Av
Aa
aW
TP
LQ
dJ
-WN
+Gg
JS
hq
-WN
+Gg
JA
gI
-WN
+Gg
XW
bW
Vc
@@ -50570,13 +50920,13 @@ LU
wl
kM
Kw
-Kw
+oS
Kw
ym
NV
FT
dI
-WN
+Gg
du
KE
SW
@@ -50833,13 +51183,13 @@ AI
NV
qv
JM
-WN
+Gg
mg
Kv
jQ
jQ
Zg
-WN
+Gg
eY
ZS
XB
@@ -51083,20 +51433,20 @@ oD
oD
aB
wl
-wl
-wl
-wl
-wl
+WN
+WN
+WN
+WN
cw
Rg
dT
-WN
+Gg
gb
Qw
Ea
pp
tM
-WN
+Gg
Wy
Dk
Te
@@ -51347,7 +51697,7 @@ WN
PT
xH
ec
-WN
+Gg
gg
ZJ
ak
@@ -51377,8 +51727,8 @@ GM
FE
eY
Jz
-un
-GP
+rB
+Jj
tR
IM
jd
@@ -51604,13 +51954,13 @@ tq
cF
Rg
eg
-WN
+Gg
gi
kk
Ii
iz
-WN
-WN
+Gg
+Gg
eY
zh
XB
@@ -51629,7 +51979,7 @@ eY
pE
zO
eY
-eY
+DX
pd
Ty
eY
@@ -51861,12 +52211,12 @@ WN
cO
sI
RY
-WN
-WN
-WN
-WN
-WN
-WN
+Gg
+Gg
+Gg
+Gg
+Gg
+Gg
eY
Gw
Dk
@@ -51876,7 +52226,7 @@ Cl
Te
Te
Te
-WW
+Te
Te
GK
Te
@@ -51885,7 +52235,7 @@ Dl
VU
mq
vu
-Eu
+eY
Dy
Dy
Dy
@@ -51898,7 +52248,7 @@ bf
Zj
ox
YW
-CT
+By
if
qm
qm
@@ -52385,12 +52735,12 @@ eY
ds
mP
mP
-CA
-DV
mP
+DV
+mk
mP
mP
-Te
+eC
mP
DT
mP
@@ -52627,8 +52977,8 @@ sh
iV
VI
kb
-za
Fv
+BL
Tz
OQ
VI
@@ -52647,12 +52997,12 @@ mz
mP
mP
mP
-Te
+eC
mP
mP
mP
gc
-mk
+mP
mP
PX
qB
@@ -52900,7 +53250,7 @@ PF
hi
eY
Zn
-Dk
+Pp
NO
hI
HR
@@ -53161,7 +53511,7 @@ mD
dK
CG
uY
-Te
+ch
qQ
CG
tn
@@ -53414,7 +53764,7 @@ AR
Ce
eY
MG
-dH
+tH
fx
ig
uG
@@ -53433,7 +53783,7 @@ jS
tp
Mi
sf
-kg
+Rc
Gy
td
VM
@@ -53671,7 +54021,7 @@ Xz
xL
eY
Gt
-dH
+tH
mP
mP
mP
@@ -53928,7 +54278,7 @@ WQ
Ce
eY
HK
-dH
+tH
mP
kQ
kQ
@@ -54185,7 +54535,7 @@ WQ
rC
eY
lf
-dH
+tH
mP
qq
qq
@@ -54442,15 +54792,15 @@ Ql
zU
eY
zw
-dH
+tH
mP
qq
qq
-Te
+fA
qq
qq
-mP
-ct
+xC
+sk
Gm
eY
oM
@@ -54703,7 +55053,7 @@ JN
JC
iA
iA
-Te
+CA
iA
iA
mP
@@ -54956,15 +55306,15 @@ RQ
VE
eY
Cx
-Dk
+eE
Xe
-Te
-Te
+WW
+WW
jX
-Te
-Te
-mP
-ct
+WW
+WW
+Ih
+Gv
mP
eY
LZ
@@ -55492,7 +55842,7 @@ px
ku
vT
oH
-lj
+tS
Ci
Pm
qk
@@ -56499,13 +56849,13 @@ sh
iV
eY
JF
-eY
+AG
eY
sx
sx
sx
eY
-eY
+YX
wT
eY
eY
@@ -56519,8 +56869,8 @@ pq
zD
Mi
Ab
-QV
-lj
+DK
+DC
ZK
Pm
Ju
@@ -57792,8 +58142,8 @@ Jc
BN
US
Ok
-Jc
UK
+Jc
Ph
et
fI
@@ -58313,7 +58663,7 @@ QD
uF
uE
OT
-oS
+lp
HO
QD
dA
@@ -58563,8 +58913,8 @@ Jc
hy
US
BN
-Jc
UK
+Jc
jx
QD
yP
@@ -59334,8 +59684,8 @@ Jc
BN
US
BN
-Jc
-DX
+UK
+yB
jx
QD
Ko
diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm
index 99ddd01f70e..3b45dc9ba71 100644
--- a/_maps/map_files/Atlas/atlas2.dmm
+++ b/_maps/map_files/Atlas/atlas2.dmm
@@ -224,6 +224,9 @@
/obj/structure/table/reinforced,
/obj/item/storage/bag/tray,
/obj/item/kitchen/fork,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"aX" = (
@@ -270,6 +273,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
"bj" = (
@@ -292,7 +298,6 @@
/area/crew_quarters/kitchen)
"bs" = (
/obj/machinery/computer/ship/viewscreen,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/tile/ship/green{
dir = 4
},
@@ -305,12 +310,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/durasteel/techfloor,
/area/engine/gravity_generator)
"by" = (
@@ -591,6 +592,9 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"cV" = (
@@ -631,11 +635,19 @@
/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
+"dd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/durasteel/techfloor,
+/area/ai_monitored/turret_protected/aisat)
"dg" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -646,6 +658,9 @@
dir = 8;
sortType = 22
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"dk" = (
@@ -678,7 +693,7 @@
dir = 8
},
/turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
"do" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/ship/preopen{
@@ -702,6 +717,9 @@
/obj/machinery/door/window/eastright{
req_one_access_txt = "20"
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
"dp" = (
@@ -715,20 +733,9 @@
/turf/open/floor/durasteel/techfloor,
/area/ai_monitored/turret_protected/ai)
"dv" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/monotile/steel,
-/area/bridge/cic)
+/obj/structure/hull_plate,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
"dw" = (
/obj/effect/turf_decal/tile/ship/half/green{
dir = 8
@@ -834,10 +841,16 @@
/obj/structure/closet/crate/freezer/blood,
/obj/machinery/iv_drip,
/obj/item/reagent_containers/blood/APlus,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/monotile/dark,
/area/medical/medbay)
"dO" = (
/obj/effect/landmark/start/geneticist,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
"dQ" = (
@@ -850,6 +863,9 @@
/obj/structure/table/wood,
/obj/item/storage/box/squad_lanyards,
/obj/item/stamp/xo,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"dW" = (
@@ -873,6 +889,7 @@
/area/crew_quarters/bar/mess_hall)
"eb" = (
/obj/item/kirbyplants/photosynthetic,
+/obj/structure/pool_ladder,
/turf/open/floor/carpet/ship,
/area/crew_quarters/dorms)
"ec" = (
@@ -896,13 +913,6 @@
/turf/open/floor/circuit/telecomms/server,
/area/tcommsat/server)
"eg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool{
dir = 4
},
@@ -1054,6 +1064,12 @@
/obj/structure/chair/stool{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"eL" = (
@@ -1361,7 +1377,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/tile/ship/green{
dir = 4
@@ -1569,18 +1584,18 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"gY" = (
@@ -1614,6 +1629,12 @@
/obj/structure/sign/ship/deck,
/turf/closed/wall/steel,
/area/maintenance/nsv/deck1/port)
+"hp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/durasteel/techfloor,
+/area/engine/gravity_generator)
"hq" = (
/obj/machinery/computer/ship/dradis{
dir = 8
@@ -1716,6 +1737,21 @@
"hN" = (
/turf/closed/wall/r_wall,
/area/medical/morgue)
+"hO" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"hP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1744,13 +1780,21 @@
/obj/machinery/light_switch/west,
/turf/open/floor/durasteel/lino,
/area/ai_monitored/nuke_storage)
+"hZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/durasteel/techfloor,
+/area/engine/gravity_generator)
"if" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/carpet/blue,
/area/bridge/cic)
"ig" = (
@@ -1826,6 +1870,12 @@
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"iv" = (
@@ -2184,10 +2234,13 @@
/turf/open/floor/carpet/red,
/area/security/detectives_office)
"jH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/effect/landmark/start/geneticist,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
-/obj/effect/landmark/start/geneticist,
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
"jI" = (
@@ -2409,6 +2462,10 @@
/obj/item/wrench/medical,
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
+"kJ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
"kK" = (
/obj/machinery/computer/ship/viewscreen,
/obj/structure/table/reinforced,
@@ -2426,13 +2483,16 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/xo)
"kN" = (
/obj/structure/hull_plate,
/obj/machinery/ship_weapon/gauss_gun,
/turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/starboard)
"kO" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -2504,6 +2564,7 @@
/obj/machinery/camera/autoname{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"kZ" = (
@@ -2635,6 +2696,15 @@
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
+"ls" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/blue,
+/area/bridge/cic)
"lu" = (
/obj/structure/fluff/bleepypanel{
dir = 8
@@ -2757,7 +2827,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
"lZ" = (
/obj/effect/turf_decal/tile/ship/half/yellow{
dir = 8
@@ -2826,6 +2896,7 @@
dir = 1
},
/obj/machinery/suit_storage_unit/captain,
+/obj/item/tank/internals/oxygen,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
"ms" = (
@@ -2850,8 +2921,9 @@
/turf/open/floor/plating,
/area/medical/morgue)
"mv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
+/obj/effect/landmark/start/head_of_personnel{
+ icon_state = "Executive Officer";
+ name = "Executive Officer"
},
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/xo)
@@ -2944,8 +3016,10 @@
/obj/effect/turf_decal/tile/ship/half/green{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck1/hallway)
"mW" = (
@@ -2971,7 +3045,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
+"ne" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
"nf" = (
/obj/machinery/porta_turret/ai,
/obj/effect/turf_decal/stripes/box,
@@ -3072,7 +3151,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"nL" = (
@@ -3105,6 +3186,9 @@
/obj/effect/landmark/zebra_interlock_point,
/obj/machinery/door/firedoor/border_only/directional/west,
/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"nP" = (
@@ -3236,6 +3320,16 @@
},
/turf/open/floor/monotile/steel,
/area/hydroponics)
+"os" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
"ot" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
@@ -3363,13 +3457,13 @@
pixel_x = -25;
pixel_y = -6
},
-/obj/effect/landmark/start/head_of_security,
/obj/machinery/firealarm/directional/west{
pixel_y = 12
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"pe" = (
@@ -3409,9 +3503,6 @@
/obj/effect/turf_decal/tile/ship/half/green{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
/obj/machinery/status_display/evac/east,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
@@ -3450,6 +3541,15 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"pz" = (
@@ -3465,6 +3565,12 @@
"pD" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
"pE" = (
@@ -3479,6 +3585,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"pG" = (
@@ -3572,6 +3679,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
+/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
"qi" = (
@@ -3580,6 +3688,9 @@
/obj/structure/chair/stool{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"qk" = (
@@ -3594,6 +3705,13 @@
dir = 4;
id = "atlas_xo"
},
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plating,
/area/crew_quarters/heads/xo)
"ql" = (
@@ -3613,13 +3731,13 @@
/obj/structure/railing/corner{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
- },
/obj/structure/disposalpipe/sorting/mail{
sortType = 5;
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"qo" = (
@@ -3629,9 +3747,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/ship/half/green{
dir = 1
@@ -3643,6 +3758,7 @@
/area/crew_quarters/kitchen)
"qx" = (
/obj/machinery/suit_storage_unit/cmo,
+/obj/item/tank/internals/oxygen,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/cmo)
"qz" = (
@@ -3681,6 +3797,9 @@
/obj/structure/chair/office{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
"qM" = (
@@ -3704,6 +3823,7 @@
/area/hallway/nsv/deck1/hallway)
"qS" = (
/obj/machinery/light,
+/obj/machinery/computer/pandemic,
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
"qT" = (
@@ -3840,6 +3960,7 @@
/area/maintenance/nsv/deck1/port)
"rv" = (
/obj/machinery/suit_storage_unit/ce,
+/obj/item/tank/internals/oxygen,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/chief)
"rw" = (
@@ -3851,13 +3972,17 @@
},
/obj/effect/landmark/nuclear_waste_spawner,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/durasteel/techfloor,
/area/ai_monitored/turret_protected/aisat)
"ry" = (
/obj/machinery/recharge_station,
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
+"rz" = (
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/ore_silo,
+/turf/open/floor/monotile/dark,
+/area/ai_monitored/nuke_storage)
"rA" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -3886,15 +4011,10 @@
"rN" = (
/obj/structure/table/reinforced,
/obj/item/paicard,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"rO" = (
@@ -4052,7 +4172,7 @@
dir = 9
},
/turf/open/floor/engine,
-/area/maintenance/nsv/deck1/port)
+/area/nsv/weapons/gauss/battery/deck2/port)
"su" = (
/obj/effect/turf_decal/tile/ship/green,
/obj/effect/turf_decal/tile/ship/green{
@@ -4164,6 +4284,11 @@
},
/turf/open/floor/plating,
/area/tcommsat/server)
+"sS" = (
+/obj/effect/landmark/start/botanist,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
"sT" = (
/obj/effect/turf_decal/tile/ship/blue,
/obj/effect/turf_decal/tile/ship/blue{
@@ -4200,11 +4325,11 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/door/airlock/ship/maintenance,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/maintenance,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"tb" = (
@@ -4291,6 +4416,16 @@
icon_state = "platingdmg3"
},
/area/maintenance/nsv/deck1/port)
+"tv" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
"tx" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4314,6 +4449,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/durasteel/techfloor,
/area/engine/gravity_generator)
"tC" = (
@@ -4465,6 +4606,21 @@
"uj" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
+"uk" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"ur" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/firealarm/directional/north,
@@ -4573,6 +4729,13 @@
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
+"uV" = (
+/obj/effect/turf_decal/tile/ship/half/green,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"uX" = (
/obj/machinery/door/airlock/ship/maintenance,
/obj/structure/cable{
@@ -4687,8 +4850,18 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
+"vq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/carpet/blue,
+/area/bridge/cic)
"vs" = (
/obj/effect/turf_decal/tile/ship/green,
/obj/effect/turf_decal/tile/ship/green{
@@ -4829,7 +5002,7 @@
/obj/structure/hull_plate,
/obj/machinery/ship_weapon/gauss_gun/north,
/turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/port)
"vZ" = (
/turf/open/floor/monotile/light,
/area/crew_quarters/kitchen)
@@ -4938,6 +5111,9 @@
"wH" = (
/obj/structure/table/reinforced,
/obj/item/folder,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"wK" = (
@@ -4989,6 +5165,9 @@
/obj/effect/landmark/zebra_interlock_point,
/obj/machinery/door/firedoor/border_only/directional/west,
/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"wX" = (
@@ -5037,6 +5216,12 @@
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"xd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
"xf" = (
@@ -5080,9 +5265,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
@@ -5093,6 +5275,9 @@
id = "deck1_medical";
next_id = "deck1_stairs"
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"xo" = (
@@ -5139,9 +5324,6 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/chief)
"xr" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/blue,
/area/bridge/cic)
@@ -5172,6 +5354,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/rnd/production/protolathe/department/service,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen)
"xx" = (
@@ -5313,6 +5496,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"yl" = (
@@ -5345,8 +5534,8 @@
/obj/machinery/computer/cryopod{
pixel_y = 26
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/landmark/latejoin,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/carpet/green,
/area/hallway/nsv/deck1/hallway)
"ys" = (
@@ -5398,11 +5587,12 @@
/obj/machinery/camera/autoname{
dir = 1
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
/turf/open/floor/durasteel/techfloor,
/area/engine/gravity_generator)
+"yA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
"yB" = (
/obj/structure/chair/fancy/sofa/old/left{
dir = 1
@@ -5583,6 +5773,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"zK" = (
@@ -5614,12 +5807,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/beacon,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/carpet/blue,
/area/bridge/cic)
"zS" = (
@@ -5639,10 +5830,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"zW" = (
@@ -5652,6 +5845,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"zY" = (
@@ -5668,11 +5865,15 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/sorting/mail/flip{
sortType = 15
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"Aa" = (
@@ -5769,6 +5970,9 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/xo)
"Ar" = (
@@ -5780,6 +5984,11 @@
/obj/machinery/power/apc/auto_name/north,
/turf/open/floor/carpet/ship,
/area/crew_quarters/dorms)
+"As" = (
+/obj/structure/hull_plate,
+/obj/machinery/camera/autoname,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
"Ax" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -5800,6 +6009,12 @@
/obj/structure/extinguisher_cabinet/north{
pixel_x = -6
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"AE" = (
@@ -5838,6 +6053,9 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/port)
+"AS" = (
+/turf/closed/wall/r_wall,
+/area/nsv/weapons/gauss/battery/deck2/starboard)
"AT" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/ship/half/green,
@@ -5853,6 +6071,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"AX" = (
@@ -5867,8 +6091,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
},
/turf/open/floor/monotile/dark,
/area/medical/medbay)
@@ -5902,9 +6126,6 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"Bk" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
/obj/machinery/light/small,
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -5979,11 +6200,13 @@
/area/medical/medbay)
"BE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"BF" = (
@@ -6147,6 +6370,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
+/obj/effect/landmark/start/chief_engineer,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/chief)
"Ct" = (
@@ -6350,6 +6574,9 @@
pixel_x = -2;
pixel_y = 3
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"Dp" = (
@@ -6447,6 +6674,9 @@
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"DA" = (
@@ -6476,6 +6706,20 @@
/obj/machinery/door/window,
/turf/open/floor/monotile/dark,
/area/medical/medbay)
+"DD" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"DE" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6483,15 +6727,13 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"DJ" = (
@@ -6579,14 +6821,8 @@
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
"Ea" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/monotile/dark,
-/area/crew_quarters/bar/mess_hall)
+/turf/closed/wall/r_wall,
+/area/nsv/weapons/gauss/battery/deck2/port)
"Ed" = (
/obj/structure/railing,
/turf/open/openspace,
@@ -6619,6 +6855,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"Em" = (
@@ -6689,10 +6928,10 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/xo)
"EA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
/obj/item/beacon,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/medical/medbay)
"EB" = (
@@ -6728,6 +6967,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet/blue,
/area/bridge/cic)
+"EI" = (
+/obj/effect/turf_decal/tile/ship/green,
+/obj/effect/turf_decal/tile/ship/green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
"EL" = (
/obj/structure/grille/broken,
/obj/structure/reagent_dispensers/fueltank,
@@ -6806,12 +7055,6 @@
/obj/structure/chair/office{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
/obj/effect/landmark/start/head_of_personnel{
icon_state = "Executive Officer";
name = "Executive Officer"
@@ -6928,7 +7171,6 @@
},
/area/maintenance/nsv/deck1/starboard)
"FC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/landmark/patrol_node{
id = "deck1_bar";
next_id = "deck1_bridge"
@@ -7040,16 +7282,18 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/chair/stool{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"Ge" = (
@@ -7159,6 +7403,11 @@
icon_state = "panelscorched"
},
/area/maintenance/nsv/deck1/starboard)
+"GK" = (
+/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/monotile/dark,
+/area/hydroponics)
"GM" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/cmo)
@@ -7190,10 +7439,10 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"GZ" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"Hb" = (
@@ -7311,6 +7560,7 @@
dir = 1
},
/obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck1/hallway)
"Ht" = (
@@ -7340,6 +7590,7 @@
dir = 1
},
/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck1/hallway)
"HB" = (
@@ -7463,6 +7714,7 @@
/turf/open/floor/plating,
/area/hydroponics)
"Ig" = (
+/obj/effect/landmark/start/research_director,
/turf/open/floor/carpet/ship/beige_carpet,
/area/crew_quarters/heads/hor)
"Ih" = (
@@ -7707,6 +7959,9 @@
/area/hallway/nsv/deck1/hallway)
"IX" = (
/obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
/turf/open/floor/monotile/dark,
/area/medical/medbay)
"IY" = (
@@ -7758,17 +8013,14 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
"Jl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/ship/half/green{
dir = 1
},
/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hydroponics)
"Jn" = (
@@ -7791,6 +8043,9 @@
dir = 8
},
/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"Jo" = (
@@ -7853,6 +8108,21 @@
/obj/machinery/light,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo)
+"JE" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"JG" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -8270,6 +8540,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"Ll" = (
@@ -8330,10 +8603,11 @@
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"LG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/monotile/dark,
-/area/crew_quarters/bar/mess_hall)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/monotile/steel,
+/area/hallway/nsv/deck1/hallway)
"LJ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
@@ -8369,6 +8643,9 @@
/area/maintenance/nsv/deck1/port)
"LN" = (
/obj/effect/landmark/start/medical_doctor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/medical/medbay)
"LP" = (
@@ -8410,7 +8687,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/requests_console{
announcementConsole = 1;
department = "Head of Security's Desk";
@@ -8418,12 +8695,12 @@
name = "Head of Security RC";
pixel_y = 26
},
+/obj/item/tank/internals/oxygen,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"LT" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 8
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/landmark/start/captain,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"LU" = (
@@ -8514,13 +8791,14 @@
dir = 4;
id = "atlas_cap"
},
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
/turf/open/floor/plating,
/area/crew_quarters/heads/captain)
"Mq" = (
/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
/turf/open/floor/durasteel/techfloor,
/area/engine/gravity_generator)
"Mr" = (
@@ -8598,11 +8876,15 @@
/turf/open/floor/durasteel/techfloor,
/area/ai_monitored/turret_protected/aisat)
"MJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/monotile/dark,
-/area/hydroponics)
+/obj/effect/turf_decal/tile/ship/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/ship/blue,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/durasteel/alt,
+/area/hallway/nsv/deck1/hallway)
"MN" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -8955,11 +9237,24 @@
req_one_access_txt = "20"
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
"NU" = (
/turf/open/floor/plating,
/area/medical/morgue)
+"NV" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/medical/morgue)
"NX" = (
/obj/machinery/light,
/obj/machinery/telecomms/server/presets/command,
@@ -9055,13 +9350,13 @@
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"Ou" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/light/small{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/structure/lattice/catwalk/over/ship,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"Ov" = (
@@ -9105,12 +9400,6 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/item/paper_bin,
/obj/item/pen,
/obj/effect/landmark/zebra_interlock_point,
@@ -9118,6 +9407,7 @@
/obj/machinery/door/window/eastleft{
req_one_access_txt = "57"
},
+/obj/structure/cable,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"OB" = (
@@ -9138,6 +9428,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/port)
+"OI" = (
+/obj/structure/pool_ladder,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/dorms)
"OM" = (
/obj/machinery/door/airlock/ship/public/glass{
name = "Hydroponics";
@@ -9217,7 +9511,6 @@
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"Pe" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/effect/turf_decal/tile/ship/green{
dir = 1
},
@@ -9254,6 +9547,16 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/nsv/deck1/central)
+"Po" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/monotile/dark,
+/area/crew_quarters/bar/mess_hall)
"Pp" = (
/obj/structure/railing{
dir = 1
@@ -9296,12 +9599,6 @@
/obj/structure/chair/office{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 8
- },
/obj/effect/landmark/start/captain,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/captain)
@@ -9349,7 +9646,6 @@
},
/obj/machinery/camera/autoname,
/obj/item/radio/intercom/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/durasteel/alt,
/area/hallway/nsv/deck1/hallway)
"PN" = (
@@ -9384,6 +9680,13 @@
/obj/machinery/cryopod,
/turf/open/floor/carpet/green,
/area/hallway/nsv/deck1/hallway)
+"PU" = (
+/obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/monotile/dark,
+/area/medical/medbay)
"PX" = (
/obj/structure/closet/radiation,
/turf/open/floor/plating,
@@ -9696,11 +9999,11 @@
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"Rw" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/obj/effect/landmark/latejoin,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"RC" = (
@@ -9745,6 +10048,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"RM" = (
@@ -9897,13 +10206,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/carpet/blue,
/area/bridge/cic)
"SM" = (
@@ -9945,6 +10250,16 @@
},
/turf/open/floor/engine,
/area/hallway/nsv/deck1/hallway)
+"SV" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"SW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/medical/morgue)
"SX" = (
/obj/structure/lattice,
/turf/open/openspace,
@@ -9974,12 +10289,6 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"Tg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
/obj/effect/landmark/start/assistant,
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
@@ -10011,6 +10320,9 @@
/obj/item/bedsheet/hop{
name = "executive officer's bedsheet"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/xo)
"Tk" = (
@@ -10094,8 +10406,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
},
/turf/open/floor/plating,
/area/medical/morgue)
@@ -10178,13 +10490,13 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 10
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"TZ" = (
@@ -10221,10 +10533,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"Uh" = (
@@ -10253,6 +10567,9 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"Ul" = (
@@ -10321,6 +10638,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
"UA" = (
@@ -10333,14 +10651,9 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/central)
"UE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/carpet/blue,
-/area/bridge/cic)
+/obj/structure/hull_plate,
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/port)
"UG" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -10351,9 +10664,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"UH" = (
@@ -10432,6 +10749,7 @@
icon_state = "1-2"
},
/obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/steel,
/area/crew_quarters/bar/mess_hall)
"US" = (
@@ -10443,6 +10761,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
+"UV" = (
+/obj/structure/hull_plate,
+/obj/machinery/camera/autoname{
+ dir = 1
+ },
+/turf/open/floor/engine/airless,
+/area/nsv/weapons/gauss/battery/deck2/port)
"UX" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -10481,6 +10806,15 @@
},
/turf/open/floor/monotile/dark,
/area/engine/gravity_generator)
+"Vk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/durasteel/lino,
+/area/medical/medbay)
"Vl" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -10553,7 +10887,7 @@
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"VE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/monotile/dark,
@@ -10563,7 +10897,14 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"VI" = (
-/obj/machinery/airalarm/directional/north,
+/obj/machinery/airalarm/all_access{
+ pixel_y = 25;
+ mode = 5
+ },
+/obj/item/paper/fluff/awaymissions{
+ default_raw_text = "Remember to turn on the Air Alarm- Engineering";
+ name = "IMPORTANT REMINDER"
+ },
/turf/open/floor/carpet/red,
/area/security/detectives_office)
"VJ" = (
@@ -10629,6 +10970,12 @@
dir = 8
},
/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/monotile/dark,
/area/bridge/cic)
"VZ" = (
@@ -10643,6 +10990,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/steel,
/area/bridge/cic)
"Wf" = (
@@ -11028,9 +11381,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
@@ -11076,13 +11426,15 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar/mess_hall)
"Yt" = (
@@ -11174,10 +11526,13 @@
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/hallway)
"YP" = (
-/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/ship/half/green{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/hydroponics/constructable,
/turf/open/floor/monotile/steel,
/area/hydroponics)
"YR" = (
@@ -11186,17 +11541,17 @@
pixel_y = 16
},
/turf/open/floor/engine/airless,
-/area/space/nearstation)
+/area/nsv/weapons/gauss/battery/deck2/port)
"YU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/effect/turf_decal/tile/ship/half/green{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
/turf/open/floor/monotile/steel,
/area/hydroponics)
"YV" = (
@@ -11259,8 +11614,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/durasteel/lino,
/area/medical/medbay)
@@ -35686,7 +36041,7 @@ DX
gu
wU
CT
-CT
+rz
iE
jw
Mi
@@ -36961,11 +37316,11 @@ Ag
WN
Vi
aj
-aj
+hp
Mq
yE
mf
-em
+rZ
Yk
Ly
wa
@@ -37475,12 +37830,12 @@ EB
WN
kB
CP
-aj
+hZ
yz
yE
QJ
-rZ
-ui
+em
+dd
rZ
sj
cQ
@@ -40309,7 +40664,7 @@ Xv
Ql
Uf
Bs
-Xv
+DD
Lz
Xv
Nb
@@ -40566,7 +40921,7 @@ Zr
nr
pl
Db
-Zr
+os
Zr
kp
NL
@@ -41599,8 +41954,8 @@ uj
UA
gq
hA
-wu
-YC
+JE
+uV
TE
DK
lA
@@ -42370,7 +42725,7 @@ uj
dF
gq
Hq
-wu
+jQ
Sc
XZ
lo
@@ -42602,19 +42957,19 @@ HI
qO
qO
tz
-HI
-HI
-HI
-HI
-HI
-HI
-HI
+Ea
+Ea
+Ea
+Ea
+Ea
+Ea
+Ea
SX
oj
hk
-HT
-zV
-Sc
+MQ
+Cb
+tv
Am
Tc
Tc
@@ -42626,7 +42981,7 @@ Fh
Tc
Tc
jx
-HT
+MQ
zV
Sc
MS
@@ -42859,13 +43214,13 @@ HI
qO
qO
tz
-HI
-mK
-mK
-mK
-mK
-mK
-HI
+Ea
+UE
+UE
+UE
+UE
+UE
+Ea
SX
Pp
Re
@@ -42890,11 +43245,11 @@ LQ
Ya
rO
MS
-lx
-mK
-mK
-mK
-mK
+AS
+dv
+dv
+dv
+dv
mK
Rg
cL
@@ -43116,18 +43471,18 @@ HI
qO
qO
tz
-HI
-mK
-mK
-mK
-mK
+Ea
+UE
+UE
+UE
+UE
vW
-HI
+Ea
SX
Ku
HG
PM
-cz
+hO
Em
aP
xS
@@ -43147,11 +43502,11 @@ MS
Va
rO
MS
-mK
-mK
+dv
+dv
kN
-mK
-mK
+dv
+dv
mK
Rg
cL
@@ -43373,13 +43728,13 @@ HI
HI
HI
HX
-HI
-mK
-mK
-mK
-mK
-qG
-HI
+Ea
+UE
+UE
+UE
+UE
+UV
+Ea
SX
vu
HG
@@ -43404,11 +43759,11 @@ MS
wX
db
MS
-yg
-mK
-mK
-mK
-mK
+As
+dv
+dv
+dv
+dv
mK
Rg
cx
@@ -43630,13 +43985,13 @@ HI
HI
Zf
MF
-HI
+Ea
lX
-HI
-mK
-mK
-mK
-HI
+Ea
+UE
+UE
+UE
+Ea
SX
vu
HG
@@ -43656,16 +44011,16 @@ Tc
Am
IY
xn
-Sc
+EI
MS
dH
rV
MS
-mK
-mK
-mK
-mK
-mK
+dv
+dv
+dv
+dv
+dv
mK
Rg
cx
@@ -43887,18 +44242,18 @@ qb
HI
zK
Bl
-HI
+Ea
dn
-HI
-mK
-mK
+Ea
+UE
+UE
vW
-HI
+Ea
ZR
BJ
HG
-MQ
-wu
+vU
+cz
Sc
Tc
Tc
@@ -43918,11 +44273,11 @@ MS
Om
bU
MS
-mK
-mK
+dv
+dv
kN
-mK
-mK
+dv
+dv
mK
Rg
cx
@@ -44146,11 +44501,11 @@ rg
ot
na
ss
-HI
+Ea
YR
-mK
-mK
-HI
+UE
+UE
+Ea
cm
LL
HG
@@ -44175,11 +44530,11 @@ MS
Ge
lh
MS
-lx
-mK
-mK
-mK
-mK
+AS
+dv
+dv
+dv
+dv
mK
Rg
cx
@@ -44433,8 +44788,8 @@ MS
ta
MS
MS
-lx
-lx
+MS
+MS
MS
MS
MS
@@ -44669,8 +45024,8 @@ ii
Xw
uG
MQ
-wu
-Sc
+Cb
+tv
MZ
iB
Lj
@@ -44682,8 +45037,8 @@ EZ
NY
kT
zt
-MQ
-wu
+HT
+jQ
Sc
pB
CF
@@ -45429,9 +45784,9 @@ qO
HI
PC
NK
-XP
-Yj
-NK
+sS
+yA
+GK
YP
mz
uG
@@ -45687,8 +46042,8 @@ HI
Tw
NK
Ce
-mW
-MJ
+Yj
+NK
Jl
mz
LX
@@ -45728,7 +46083,7 @@ Mf
Jd
MS
aa
-NU
+NV
jz
hN
FM
@@ -45967,7 +46322,7 @@ TO
ej
lD
nV
-HT
+vU
TX
nD
DQ
@@ -45985,7 +46340,7 @@ Mf
av
MS
ZY
-NU
+SW
jz
hN
FM
@@ -46201,8 +46556,8 @@ HI
am
NK
Yj
-Yj
-NK
+kJ
+ne
YU
jc
aq
@@ -46220,7 +46575,7 @@ SK
EH
zM
if
-SK
+ls
JW
UG
Dp
@@ -46473,11 +46828,11 @@ sH
OY
RL
Qc
-UE
+pw
gY
xr
+vq
pw
-UE
Qc
AU
OY
@@ -46490,7 +46845,7 @@ Zl
CG
DQ
AY
-bi
+Vk
rX
WJ
MS
@@ -46730,11 +47085,11 @@ rc
wz
Wd
bZ
-dv
+ht
ht
ht
fe
-dv
+ht
bZ
yh
ZN
@@ -46996,8 +47351,8 @@ Mp
NP
at
fS
-zV
-sA
+uk
+MJ
DQ
Oe
Mo
@@ -47016,7 +47371,7 @@ XN
NU
mt
hN
-cL
+SV
SP
cL
cL
@@ -47234,7 +47589,7 @@ mW
rm
Iw
bk
-BE
+Po
om
UU
UU
@@ -47273,8 +47628,8 @@ hN
hN
hN
hN
-cL
-gn
+SV
+SP
cL
cL
cL
@@ -47785,9 +48140,9 @@ dQ
dQ
lx
cx
+vc
cx
-cx
-Cf
+SP
Zp
cL
cL
@@ -48008,8 +48363,8 @@ Pf
hJ
hJ
FC
-LG
-Ea
+hJ
+hJ
Ys
nG
SH
@@ -48029,7 +48384,7 @@ sc
cH
kE
zH
-IX
+PU
TM
vf
WJ
@@ -48042,10 +48397,10 @@ dQ
dQ
cx
cx
-cx
+vc
cx
cL
-gn
+SP
cL
cL
cL
@@ -48299,9 +48654,9 @@ cx
cx
cx
cx
+vc
cx
-cx
-gn
+SP
SP
cL
cL
@@ -48551,15 +48906,15 @@ WJ
cx
cx
cx
-cx
-cx
-cx
-cx
-cx
-cx
+vc
+vc
+vc
+vc
+vc
+vc
cx
SP
-Cf
+SP
cL
cL
cL
@@ -48813,10 +49168,10 @@ cx
cx
cx
cx
-cx
+vc
cx
cL
-Cf
+SP
cL
cL
cL
@@ -49053,7 +49408,7 @@ Am
Am
Am
ST
-Em
+LG
qP
Em
Em
@@ -49070,10 +49425,10 @@ cx
cx
cx
cx
+vc
cx
-cx
-cL
-Cf
+SV
+SP
cL
cL
cL
@@ -49327,10 +49682,10 @@ cx
cx
cx
cx
+vc
cx
-cx
-cL
-Cf
+SV
+SP
cL
cL
cL
@@ -49584,10 +49939,10 @@ cx
cx
cx
cx
+vc
cx
-cx
-cL
-Cf
+SV
+SP
cL
cL
cL
@@ -49841,10 +50196,10 @@ cx
cx
cx
cx
-cx
+vc
cx
cL
-Cf
+SP
cL
cL
cL
@@ -50067,7 +50422,7 @@ xf
Ar
LR
eb
-xf
+OI
xf
mK
mK
@@ -50323,8 +50678,8 @@ sh
xf
xf
xf
-xf
-xf
+OI
+OI
mK
mK
mK
@@ -50358,7 +50713,7 @@ cx
cx
cx
cL
-Cf
+SP
cL
cL
cL
@@ -50615,7 +50970,7 @@ cx
cx
cx
SP
-Cf
+SP
cL
cL
cL
diff --git a/_maps/map_files/Eclipse/Eclipse1.dmm b/_maps/map_files/Eclipse/Eclipse1.dmm
index 5864a40a510..325369bf636 100644
--- a/_maps/map_files/Eclipse/Eclipse1.dmm
+++ b/_maps/map_files/Eclipse/Eclipse1.dmm
@@ -638,12 +638,6 @@
/turf/open/floor/plating,
/area/nsv/weapons/fore)
"dm" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/ladder,
/obj/effect/turf_decal/stripes/box,
/obj/structure/sign/ship/space{
@@ -1491,7 +1485,6 @@
},
/area/crew_quarters/lounge)
"gL" = (
-/obj/structure/cable,
/turf/open/floor/plasteel/dark/side{
dir = 10
},
@@ -2572,13 +2565,6 @@
},
/turf/open/floor/noslip/white,
/area/crew_quarters/toilet/restrooms)
-"kD" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/caution/stand_clear,
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
"kE" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -3243,9 +3229,6 @@
/turf/open/floor/plasteel/tiled/light,
/area/medical/sleeper)
"mZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/closed/wall/steel,
@@ -3348,6 +3331,15 @@
/obj/structure/table/reinforced,
/turf/open/floor/monotile/dark,
/area/crew_quarters/bar)
+"nw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/monotile/dark,
+/area/nsv/weapons/fore)
"nz" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
@@ -3466,15 +3458,6 @@
},
/turf/open/floor/plasteel/tiled/light,
/area/medical/sleeper)
-"oa" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
- },
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
"ob" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -4366,16 +4349,18 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/cable,
/turf/open/floor/monotile/steel,
/area/nsv/weapons/fore)
"rT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 4
},
-/turf/closed/wall/steel,
/area/nsv/weapons/fore)
"rX" = (
/turf/closed/wall/r_wall,
@@ -4906,12 +4891,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/dark,
/area/engine/engine_room)
-"ur" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
"us" = (
/turf/open/floor/plasteel/dark/side{
dir = 4
@@ -5028,9 +5007,6 @@
/turf/open/floor/plasteel/dark/side,
/area/engine/engine_smes)
"uO" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
@@ -6475,12 +6451,6 @@
/turf/open/floor/monotile/dark,
/area/engine/engine_smes)
"AN" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
@@ -6488,6 +6458,9 @@
dir = 8
},
/obj/machinery/light,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/monotile/steel,
/area/nsv/weapons/fore)
"AO" = (
@@ -7179,15 +7152,6 @@
},
/turf/open/floor/monotile/dark,
/area/engine/engine_room)
-"DV" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/turf/open/floor/monotile/steel,
-/area/nsv/weapons/fore)
"DW" = (
/obj/machinery/light{
dir = 8
@@ -8876,14 +8840,6 @@
dir = 4
},
/area/hallway/primary/aft)
-"KK" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/dark/side{
- dir = 8
- },
-/area/nsv/weapons/fore)
"KL" = (
/obj/structure/sign/poster/contraband/lusty_xenomorph,
/turf/closed/wall/r_wall,
@@ -12238,8 +12194,18 @@
},
/area/nsv/weapons/fore)
"Yo" = (
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark/side,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/effect/landmark/start/munitions_tech,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/monotile/dark,
/area/nsv/weapons/fore)
"Yq" = (
/obj/structure/chair/fancy/sofa/old/corner/concave{
@@ -12551,14 +12517,6 @@
/obj/structure/grille,
/turf/open/floor/circuit/telecomms/server,
/area/tcommsat/server)
-"Zz" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/dark/side{
- dir = 8
- },
-/area/nsv/weapons/fore)
"ZA" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -42871,10 +42829,10 @@ rX
Mw
ih
JX
-KK
-Zz
-Zz
-Zz
+JX
+JX
+JX
+JX
gL
rX
gY
@@ -43128,7 +43086,7 @@ rX
oN
OK
xH
-DV
+db
OK
xH
db
@@ -43385,7 +43343,7 @@ rX
Yu
OK
kl
-kD
+nR
OK
kl
nR
@@ -43640,9 +43598,9 @@ Nn
hz
rX
Yu
-oa
+Kz
Pm
-ur
+OK
OK
Pm
Kz
@@ -43898,12 +43856,12 @@ qu
yH
WC
AN
-rT
+mZ
dm
uO
mZ
rR
-Yo
+gi
rX
gY
Gs
@@ -44154,7 +44112,7 @@ Nn
hz
wJ
Zj
-bK
+rT
Xe
SV
SV
@@ -44410,8 +44368,8 @@ Az
xP
Uw
rX
-Ak
-gN
+Yo
+nw
Ak
gN
Ak
diff --git a/_maps/map_files/Eclipse/Eclipse2.dmm b/_maps/map_files/Eclipse/Eclipse2.dmm
index 9ccb2f487bf..fcc690233e5 100644
--- a/_maps/map_files/Eclipse/Eclipse2.dmm
+++ b/_maps/map_files/Eclipse/Eclipse2.dmm
@@ -38,7 +38,7 @@
dir = 1
},
/turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
"eE" = (
/obj/structure/frame/machine,
/obj/item/circuitboard/machine/anti_air,
@@ -47,7 +47,7 @@
"eO" = (
/obj/machinery/ship_weapon/gauss_gun/east,
/turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
"fb" = (
/obj/effect/turf_decal/ship/letter{
icon_state = "2"
@@ -71,7 +71,7 @@
"ho" = (
/obj/item/stack/cable_coil/red,
/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
"hM" = (
/obj/machinery/light/runway{
use_power = 0
@@ -213,7 +213,7 @@
dir = 4
},
/turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
"ys" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -227,6 +227,10 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"zg" = (
+/obj/effect/turf_decal/trimline/yellow/filled/warning,
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
"zj" = (
/obj/effect/turf_decal/ship/letter{
icon_state = "I";
@@ -234,6 +238,11 @@
},
/turf/open/floor/monotile/dark/airless,
/area/space/nearstation)
+"zr" = (
+/obj/structure/ladder,
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
"zx" = (
/obj/effect/landmark/carpspawn,
/turf/open/floor/monotile/dark/airless,
@@ -254,6 +263,10 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"AH" = (
+/obj/item/stack/tile/durasteel/mono_dark,
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
"BP" = (
/obj/structure/closet/crate/large{
anchored = 1;
@@ -268,6 +281,9 @@
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
/area/space)
+"Ej" = (
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/weapons/fore)
"Fq" = (
/obj/effect/turf_decal/ship/letter{
icon_state = "P"
@@ -280,7 +296,7 @@
},
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/turf/open/floor/monotile/dark/airless,
-/area/space/nearstation)
+/area/nsv/weapons/fore)
"Gm" = (
/obj/effect/turf_decal/tile/ship/full/yellow,
/obj/effect/turf_decal/tile/ship/full/yellow,
@@ -302,6 +318,16 @@
},
/turf/open/floor/monotile/steel/airless,
/area/space/nearstation)
+"Iv" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/monotile/dark/airless,
+/area/space/nearstation)
+"JE" = (
+/obj/item/stack/tile/durasteel/mono_dark,
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
"JV" = (
/obj/effect/turf_decal/ship/letter{
icon_state = "S"
@@ -419,6 +445,9 @@
/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/monotile/dark/airless,
/area/space/nearstation)
+"We" = (
+/turf/open/floor/plating/airless,
+/area/nsv/weapons/fore)
"WV" = (
/obj/structure/lattice,
/turf/open/space/basic,
@@ -26813,7 +26842,7 @@ YI
YI
YI
YI
-YI
+Iv
YI
YI
YI
@@ -30419,15 +30448,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -30676,15 +30705,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-UK
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+JE
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -30933,15 +30962,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -31190,15 +31219,15 @@ YI
YI
YI
YI
-jF
-UK
-YI
+JE
+We
+Ej
eO
-YI
-YI
+Ej
+Ej
eO
-YI
-YI
+Ej
+Ej
NC
MS
MS
@@ -31447,15 +31476,15 @@ pc
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-UK
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+We
+Ej
+Ej
NC
MS
MS
@@ -31704,15 +31733,15 @@ pc
YI
YI
UK
-YI
-XJ
-YI
-YI
-Mm
-YI
-YI
-UK
-YI
+Ej
+AH
+Ej
+Ej
+zr
+Ej
+Ej
+We
+Ej
NC
MS
MS
@@ -31961,15 +31990,15 @@ pc
YI
YI
YI
-YI
+Ej
ho
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -32218,15 +32247,15 @@ pc
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -32475,15 +32504,15 @@ pc
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -32732,15 +32761,15 @@ rW
YI
YI
YI
-iw
+zg
xw
Gj
xw
ed
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -32989,15 +33018,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -33246,15 +33275,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
@@ -33503,15 +33532,15 @@ YI
YI
YI
YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
-YI
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
+Ej
NC
MS
MS
diff --git a/_maps/map_files/Galactica/Galactica1.dmm b/_maps/map_files/Galactica/Galactica1.dmm
index 3564a708c46..4a71aadd233 100644
--- a/_maps/map_files/Galactica/Galactica1.dmm
+++ b/_maps/map_files/Galactica/Galactica1.dmm
@@ -14459,7 +14459,7 @@
name = "Head of Security RC";
pixel_y = 26
},
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/turf/open/floor/monotile/dark,
/area/crew_quarters/heads/hos)
"KX" = (
@@ -14681,20 +14681,20 @@
/obj/item/trash{
desc = "A relic of a more soulful security department";
icon = 'nsv13/icons/obj/clothing/suits.dmi';
- icon_state = "peacekeeper_space";
+ icon_state = "mjolnir_legacy";
name = "SG-1 Mjolnir Armour"
},
/obj/item/trash{
desc = "A relic of a more soulful security department";
icon = 'nsv13/icons/obj/clothing/suits.dmi';
- icon_state = "peacekeeper_space";
+ icon_state = "mjolnir_legacy";
name = "SG-1 Mjolnir Armour";
pixel_y = -4
},
/obj/item/trash{
desc = "A relic of a more soulful security department";
icon = 'nsv13/icons/obj/clothing/suits.dmi';
- icon_state = "peacekeeper_space";
+ icon_state = "mjolnir_legacy";
name = "SG-1 Mjolnir Armour";
pixel_y = 4
},
diff --git a/_maps/map_files/Galactica/old/Galactica_old.dmm b/_maps/map_files/Galactica/old/Galactica_old.dmm
index 448590381cf..d9f11278f5a 100644
--- a/_maps/map_files/Galactica/old/Galactica_old.dmm
+++ b/_maps/map_files/Galactica/old/Galactica_old.dmm
@@ -952,7 +952,7 @@
/turf/open/floor/monotile,
/area/crew_quarters/heads/hos)
"dd" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
diff --git a/_maps/map_files/Gladius/Gladius1.dmm b/_maps/map_files/Gladius/Gladius1.dmm
index cdcb8d38d42..18c223e1c6c 100644
--- a/_maps/map_files/Gladius/Gladius1.dmm
+++ b/_maps/map_files/Gladius/Gladius1.dmm
@@ -2690,6 +2690,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/frame1/starboard)
"bpS" = (
@@ -3249,13 +3250,7 @@
/area/maintenance/nsv/deck1/port)
"bGR" = (
/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+ dir = 6
},
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
@@ -5410,7 +5405,7 @@
"cBN" = (
/obj/machinery/computer/ship/viewscreen,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "2-8"
},
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
@@ -6909,6 +6904,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"doQ" = (
@@ -8218,17 +8214,12 @@
/turf/open/floor/carpet/ship,
/area/nsv/crew_quarters/heads/maa)
"dXH" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/nsv/hangar)
"dYj" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -9622,14 +9613,11 @@
/turf/open/floor/monotile/dark,
/area/science/xenobiology)
"eDB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+ dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
@@ -9637,12 +9625,15 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/door/airlock/ship/external/glass{
name = "Pilot Hangar";
req_one_access_txt = "79"
},
-/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck1/frame1/starboard)
+/turf/open/floor/plating,
+/area/nsv/hanger)
"eDL" = (
/obj/effect/turf_decal/loading_area/white{
dir = 1
@@ -10895,13 +10886,8 @@
/turf/open/floor/monotile/steel,
/area/bridge)
"feH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/plating/airless,
+/obj/machinery/camera/autoname,
+/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"ffa" = (
/obj/machinery/door/airlock/ship/public/glass{
@@ -10974,6 +10960,9 @@
/area/science/research)
"fgX" = (
/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"fhm" = (
@@ -11142,16 +11131,10 @@
/turf/open/floor/plating,
/area/maintenance/department/bridge)
"fmR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"fmS" = (
/obj/machinery/door/firedoor/border_only,
@@ -14398,9 +14381,13 @@
/turf/open/floor/wood,
/area/maintenance/nsv/deck1/port/aft)
"gPp" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/airless,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"gPH" = (
/obj/structure/chair/fancy/corp,
@@ -16575,12 +16562,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"hOp" = (
@@ -17537,11 +17518,11 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
/turf/open/floor/plating,
/area/maintenance/nsv/hangar)
@@ -18737,20 +18718,14 @@
/turf/open/floor/plasteel/tech/grid,
/area/nsv/weapons/ordnance)
"iMd" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/closed/wall/ship,
-/area/hallway/nsv/deck1/frame1/starboard)
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/hanger)
"iMg" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -18815,9 +18790,6 @@
name = "Ordnance Handling Bay";
req_one_access_txt = "69;31"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -19037,17 +19009,9 @@
/area/maintenance/nsv/weapons)
"iSM" = (
/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"iSP" = (
@@ -19804,10 +19768,11 @@
/turf/open/floor/monotile/steel,
/area/crew_quarters/nsv/officerquarters)
"jjF" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/turf/open/floor/monotile/dark/airless,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating/airless,
/area/nsv/hanger)
"jjK" = (
/obj/structure/table/wood,
@@ -20235,14 +20200,11 @@
/area/maintenance/nsv/weapons)
"jtu" = (
/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"jup" = (
@@ -20363,17 +20325,15 @@
/turf/open/floor/monotile/dark,
/area/science/research)
"jwB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/closed/wall/ship,
-/area/hallway/nsv/deck1/frame1/starboard)
+/turf/open/floor/monotile/dark/airless,
+/area/nsv/hanger)
"jxb" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -20893,7 +20853,7 @@
req_one_access_txt = "79"
},
/turf/open/floor/plating,
-/area/maintenance/nsv/hangar)
+/area/nsv/hanger)
"jKn" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -21347,6 +21307,7 @@
"jYx" = (
/obj/effect/turf_decal/delivery,
/obj/vehicle/sealed/car/realistic/fighter_tug,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"jYE" = (
@@ -21587,6 +21548,7 @@
/obj/effect/turf_decal/stripes/end{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"kgt" = (
@@ -22413,9 +22375,6 @@
/area/maintenance/nsv/deck1/starboard/aft)
"kzr" = (
/obj/machinery/firealarm/directional/east,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/light,
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
@@ -23124,14 +23083,20 @@
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"kSy" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plating/airless,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/ship/external/glass{
+ name = "Pilot Hangar";
+ req_one_access_txt = "79"
+ },
+/turf/open/floor/monotile/steel,
/area/nsv/hanger)
"kSE" = (
/obj/item/ship_weapon/ammunition/torpedo/decoy,
@@ -24505,13 +24470,11 @@
/turf/open/openspace,
/area/shuttle/turbolift/secondary)
"lxw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
},
-/turf/open/floor/monotile/dark/airless,
+/turf/open/floor/plating,
/area/nsv/hanger)
"lxM" = (
/obj/effect/turf_decal/tile/purple{
@@ -24897,20 +24860,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/landmark/zebra_interlock_point,
-/obj/machinery/door/airlock/ship/external/glass{
- name = "Pilot Hangar";
- req_one_access_txt = "79"
- },
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
- },
-/area/maintenance/nsv/hangar)
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/nsv/hanger)
"lIo" = (
/obj/machinery/computer/secure_data{
dir = 8
@@ -25138,7 +25091,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/frame1/starboard)
"lNu" = (
@@ -25173,19 +25126,26 @@
/turf/open/floor/plasteel/ridged/steel,
/area/nsv/weapons/starboard)
"lNY" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
/obj/structure/disposalpipe/segment{
- dir = 5
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/advanced_airlock_controller/directional/south,
/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck1/frame1/starboard)
+/area/nsv/hanger)
"lOo" = (
/obj/machinery/computer/ship/dradis{
dir = 8
@@ -27219,15 +27179,12 @@
/turf/open/floor/monotile/dark,
/area/bridge/meeting_room)
"mIt" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/requests_console{
department = "Hangar Bay";
departmentType = 2;
pixel_x = 32
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/light{
- dir = 1
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"mIw" = (
@@ -27261,8 +27218,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
@@ -27376,13 +27333,9 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/heads/hor)
"mLI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
+/turf/closed/wall/ship,
+/area/maintenance/nsv/deck1/starboard)
"mLV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -28087,18 +28040,8 @@
/turf/open/floor/monotile/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
"ndT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
- },
+/obj/machinery/light/runway/delay4,
/obj/item/radio/intercom/directional/east,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"ndV" = (
@@ -28873,12 +28816,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/turf/open/floor/plating/airless,
/area/nsv/hanger)
"nvm" = (
@@ -30568,15 +30505,9 @@
/turf/closed/wall/ship,
/area/bridge/meeting_room)
"ooj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
@@ -31084,6 +31015,12 @@
location = "munitions";
name = "UpstairsMunitionsToMedical"
},
+/obj/machinery/light{
+ brightness = 3;
+ bulb_vacuum_brightness = 2;
+ dir = 4;
+ nightshift_brightness = 1
+ },
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/frame1/starboard)
"oCs" = (
@@ -31407,18 +31344,6 @@
/obj/effect/landmark/start/scientist,
/turf/open/floor/monotile/steel,
/area/science/mixing)
-"oKI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
"oLe" = (
/obj/structure/lattice/catwalk/over/ship,
/obj/structure/disposalpipe/segment{
@@ -31755,12 +31680,6 @@
/turf/open/floor/plasteel/techmaint,
/area/science/lab)
"oQY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 5
},
@@ -32188,18 +32107,20 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 1;
name = "hangar";
sortType = 31
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/frame1/starboard)
"oYF" = (
@@ -35358,14 +35279,6 @@
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/port/aft)
-"qyC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
"qyY" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -36878,15 +36791,6 @@
},
/turf/open/floor/monotile/steel,
/area/hallway/nsv/deck1/frame1/central)
-"rkC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
"rkF" = (
/obj/effect/turf_decal/tile/ship/green{
dir = 8
@@ -36997,12 +36901,6 @@
/area/hallway/nsv/deck1/frame1/central)
"rnO" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"rnV" = (
@@ -37435,15 +37333,6 @@
},
/turf/open/floor/monotile/steel,
/area/science/research)
-"rAs" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
"rAK" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -37554,11 +37443,8 @@
/area/ai_monitored/turret_protected/aisat_interior)
"rDb" = (
/obj/structure/sign/directions/plaque/hangar,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/closed/wall/ship,
-/area/hallway/nsv/deck1/frame1/starboard)
+/turf/closed/wall/r_wall/ship,
+/area/nsv/hanger)
"rDn" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -37983,18 +37869,15 @@
/turf/open/floor/monotile/dark,
/area/teleporter)
"rRT" = (
-/obj/machinery/door/airlock/ship/external/glass{
- name = "Pilot Hangar";
- req_one_access_txt = "79"
- },
-/obj/machinery/atmospherics/pipe/layer_manifold{
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
-/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck1/frame1/starboard)
+/turf/open/floor/plating,
+/area/nsv/hanger)
"rRW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -39908,8 +39791,9 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/advanced_airlock_controller/directional/west,
+/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
-/area/maintenance/nsv/hangar)
+/area/nsv/hanger)
"sLp" = (
/obj/machinery/light_switch/south,
/obj/structure/disposalpipe/segment{
@@ -40685,12 +40569,6 @@
},
/turf/open/floor/monotile/steel,
/area/bridge/secondary)
-"tbd" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
"tbg" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -41075,9 +40953,6 @@
/area/crew_quarters/dorms/nsv/state_room)
"tlZ" = (
/obj/machinery/computer/lore_terminal,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"tme" = (
@@ -41096,6 +40971,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/central)
"tmn" = (
@@ -41661,6 +41537,11 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+ dir = 1;
+ name = "Air Out";
+ target_pressure = 1015
+ },
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
"tCI" = (
@@ -42481,15 +42362,6 @@
"uaj" = (
/turf/closed/wall/ship,
/area/maintenance/nsv/deck1/starboard/aft)
-"uan" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
"uav" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -42792,15 +42664,6 @@
},
/turf/open/floor/monotile/dark,
/area/security/warden)
-"ugk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/turf/open/floor/plasteel/airless/dark,
-/area/nsv/hanger)
"ugn" = (
/mob/living/simple_animal/bot/cleanbot{
name = "Scrubs, MD";
@@ -42900,12 +42763,6 @@
/area/crew_quarters/nsv/officerquarters)
"uke" = (
/obj/effect/turf_decal/caution,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/turf/open/floor/plasteel/airless/dark,
/area/nsv/hanger)
"ukp" = (
@@ -43163,16 +43020,6 @@
},
/turf/open/floor/monotile/dark/airless,
/area/hallway/nsv/deck1/aft)
-"uqV" = (
-/obj/effect/turf_decal/caution,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/monotile/dark/airless,
-/area/nsv/hanger)
"uqW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/ship/preopen{
@@ -43594,15 +43441,11 @@
/obj/machinery/camera/autoname{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/effect/turf_decal/bot,
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"uBf" = (
@@ -44165,6 +44008,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/carpet/ship/blue,
/area/medical/medbay/central)
"uMT" = (
@@ -44454,8 +44298,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
+ dir = 4
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
@@ -44586,13 +44430,6 @@
"uXO" = (
/turf/open/openspace,
/area/hallway/nsv/deck1/frame1/central)
-"uXT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
"uYf" = (
/obj/machinery/vending/assist,
/turf/open/floor/wood,
@@ -44853,10 +44690,6 @@
},
/turf/open/floor/monotile/steel,
/area/bridge/secondary)
-"vcD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/closed/wall/ship,
-/area/maintenance/nsv/deck1/starboard)
"vcL" = (
/obj/machinery/advanced_airlock_controller/directional/west{
pixel_y = 24
@@ -44927,12 +44760,6 @@
/area/maintenance/department/bridge)
"veB" = (
/obj/effect/turf_decal/caution,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"veD" = (
@@ -45676,13 +45503,11 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 4
- },
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/hallway/nsv/deck1/frame1/starboard)
"vvQ" = (
@@ -46787,15 +46612,6 @@
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/steel,
/area/nsv/weapons/starboard)
-"vZz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/airless/dark,
-/area/nsv/hanger)
"vZC" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -47255,7 +47071,7 @@
/turf/open/floor/monotile/light,
/area/medical/medbay/aft)
"wkn" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/status_display/evac/south,
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/hos)
@@ -47530,12 +47346,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
/turf/open/floor/monotile/dark/airless,
/area/nsv/hanger)
"wqK" = (
@@ -47734,9 +47544,15 @@
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"wtO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/closed/wall/ship,
-/area/hallway/nsv/deck1/frame1/starboard)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/advanced_airlock_controller/directional/south,
+/turf/open/floor/monotile/steel,
+/area/nsv/hanger)
"wtP" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -48684,14 +48500,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/monotile/steel,
/area/nsv/briefingroom)
-"wVz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
"wVG" = (
/obj/machinery/light,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -49274,17 +49082,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/monotile/dark,
/area/science/research)
-"xin" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/monotile/steel,
-/area/hallway/nsv/deck1/frame1/starboard)
"xir" = (
/obj/effect/turf_decal/loading_area{
dir = 1
@@ -49699,7 +49496,6 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 1
},
@@ -49847,11 +49643,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
- dir = 1;
- name = "Air Out";
- target_pressure = 4500
- },
/obj/item/ship_weapon/ammunition/torpedo/plushtide,
/turf/open/floor/plating,
/area/maintenance/nsv/deck1/starboard)
@@ -49877,16 +49668,6 @@
},
/turf/open/floor/monotile/steel,
/area/nsv/hanger/notkmcstupidhanger/atc)
-"xxW" = (
-/obj/effect/turf_decal/delivery/white,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/turf/open/floor/plating/airless,
-/area/nsv/hanger)
"xyh" = (
/obj/structure/extinguisher_cabinet/west,
/obj/structure/disposalpipe/segment{
@@ -49946,14 +49727,18 @@
/obj/item/screwdriver{
pixel_y = 6
},
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/power/apc/auto_name/south{
pixel_y = -24
},
/obj/structure/cable,
-/turf/open/floor/monotile/light,
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/turf/open/floor/monotile/steel,
/area/medical/storage)
"xzY" = (
/obj/structure/cable{
@@ -50109,6 +49894,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 4
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/hangar)
"xDV" = (
@@ -50190,9 +49976,22 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/nsv/hangar)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/ship/external/glass{
+ name = "Pilot Hangar";
+ req_one_access_txt = "79"
+ },
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/nsv/hanger)
"xEW" = (
/obj/machinery/light_switch/east,
/turf/open/floor/monotile/dark,
@@ -73580,11 +73379,11 @@ uyS
wNY
wNY
wNY
-lxw
-qyC
-wVz
-mLI
-ugk
+abu
+qOx
+pKJ
+sLN
+veP
veP
nji
veP
@@ -73837,11 +73636,11 @@ ljn
bBA
qde
iBn
-rkC
+abu
kIK
yiN
hhI
-uan
+abu
veP
veP
veP
@@ -74094,11 +73893,11 @@ abu
mLi
ciM
cgU
-dXH
-uXT
-gPp
-qtu
-uan
+abu
+mLV
+yiN
+hhI
+abu
veP
nUy
gHb
@@ -74351,7 +74150,7 @@ wNY
mLi
ciM
iCo
-bGR
+abu
mLV
yiN
hhI
@@ -74609,9 +74408,9 @@ mLi
ciM
cgU
bGR
-mLV
+iSM
jYx
-hhI
+qtu
rnO
tqN
xMZ
@@ -74865,11 +74664,11 @@ wNY
mLi
ciM
cgU
-bGR
+wqz
vMG
yiN
hhI
-uan
+abu
veP
xMZ
onu
@@ -75123,10 +74922,10 @@ mLi
ciM
cgU
wqz
-feH
+mLV
tzF
hhI
-rkC
+abu
veP
wDk
pKJ
@@ -75383,7 +75182,7 @@ hOn
efu
yiN
hhI
-uan
+abu
veP
veP
veP
@@ -75640,7 +75439,7 @@ nuC
wNY
yiN
hhI
-vZz
+veP
hVJ
xSs
roZ
@@ -75893,11 +75692,11 @@ gHb
jQR
ijs
pfY
-iSM
+qFd
kdA
yiN
hhI
-vZz
+veP
cEM
lZs
lZs
@@ -76150,11 +75949,11 @@ abu
abu
abu
abu
-bGR
+wqz
mLV
yiN
hhI
-vZz
+veP
rhU
pBr
pBr
@@ -76407,7 +76206,7 @@ hVJ
xSs
qDv
gzS
-bGR
+wqz
mLV
yiN
hhI
@@ -76655,20 +76454,20 @@ uCR
ejZ
rEw
eZO
-kUY
-kUY
-ejZ
-ejZ
+tSr
+tSr
+efk
+efk
cHk
cEM
lZs
lZs
rEQ
-bGR
+wqz
mLV
yiN
hhI
-uan
+abu
uLS
pjg
uoH
@@ -76910,7 +76709,7 @@ rvC
ggU
soR
teS
-ggU
+dXH
ijF
xEU
lIj
@@ -76921,11 +76720,11 @@ rhU
pBr
pBr
sZV
-bGR
+wqz
mLV
wNY
clD
-jtu
+pKJ
pKJ
pKJ
pKJ
@@ -77169,20 +76968,20 @@ fyh
fyh
fyh
ovq
-fyh
-fyh
-fyh
+efk
+efk
+efk
efk
aSh
abu
abu
abu
abu
-bGR
+wqz
kIK
xMR
xMR
-kSy
+xMR
xMR
xMR
xMR
@@ -77435,11 +77234,11 @@ qOx
pKJ
kaq
sLN
-bGR
+wqz
mLV
wNY
gTW
-oKI
+gHb
gHb
gHb
gHb
@@ -77692,11 +77491,11 @@ mLV
xMR
xMR
hhI
-bGR
+wqz
mLV
yiN
hhI
-uqV
+veB
uLS
pjg
uoH
@@ -77949,11 +77748,11 @@ uJn
gHb
gHb
fGG
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
veP
veP
veP
@@ -78206,11 +78005,11 @@ abu
abu
abu
abu
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
veP
nUy
gHb
@@ -78463,11 +78262,11 @@ qOx
pKJ
kaq
sLN
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
veP
xMZ
jis
@@ -78720,7 +78519,7 @@ mLV
xMR
xMR
hhI
-bGR
+wqz
vMG
yiN
hhI
@@ -78977,11 +78776,11 @@ uJn
gHb
gHb
fGG
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
bvw
xMZ
kSv
@@ -79234,11 +79033,11 @@ abu
abu
abu
abu
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
veP
wDk
pKJ
@@ -79491,11 +79290,11 @@ hVJ
xSs
qDv
gzS
-bGR
+wqz
mLV
yiN
hhI
-rkC
+abu
veP
veP
veP
@@ -79748,11 +79547,11 @@ cEM
lZs
lZs
rEQ
-bGR
+wqz
mLV
tzF
hhI
-uqV
+veB
uLS
pjg
uoH
@@ -80005,11 +79804,11 @@ rhU
pBr
pBr
sZV
-bGR
+wqz
mLV
wNY
clD
-fmR
+pKJ
pKJ
pKJ
pKJ
@@ -80258,15 +80057,15 @@ kkW
apD
efk
cBN
-abu
-abu
-abu
-abu
-bGR
+fmR
+fmR
+fmR
+fmR
+gPp
kIK
xMR
xMR
-xxW
+xMR
xMR
xMR
xMR
@@ -80519,11 +80318,11 @@ qOx
pKJ
iPj
sLN
-bGR
-uJn
+iMd
+jjF
+jtu
gHb
gHb
-oKI
gHb
gHb
gHb
@@ -80771,20 +80570,20 @@ lLm
tme
hmx
efk
-mDn
+abu
mLV
cZd
lON
qtu
ooj
fgX
-fgX
-fgX
+jwB
+mIt
oQY
pjg
tHT
fDv
-rtS
+ndT
dwQ
abu
abu
@@ -81028,22 +80827,22 @@ bez
tme
hmx
efk
-ghv
+feH
uJn
qFd
gHb
fGG
-jwB
+efk
rRT
-roe
-veP
+kSy
+efk
uAW
-xMZ
-xMZ
-xMZ
-xMZ
-xMZ
-xMZ
+efk
+efk
+efk
+efk
+efk
+efk
kSc
mtZ
efk
@@ -81285,17 +81084,17 @@ jNM
iOa
tSz
efk
-jjF
-tbd
-rAs
-tbd
+abu
+abu
+wqz
+abu
kzr
-iMd
+efk
lNY
wtO
-mIt
-ndT
-vcD
+efk
+efk
+gId
xxf
uTE
vfS
@@ -81541,16 +81340,16 @@ sVI
wJI
sAz
tOw
-xMZ
-xMZ
+efk
+efk
pHS
cef
pHS
-xMZ
+efk
rDb
eDB
-npq
-xMZ
+lxw
+efk
xMZ
kLp
mHG
@@ -81804,11 +81603,11 @@ qBP
wnX
jsy
jsy
-xin
+jsy
oYA
bpR
lNm
-kLp
+mLI
kfT
tCv
mIN
@@ -81819,7 +81618,7 @@ jus
jus
jus
xwt
-kLp
+gId
ouk
cgF
kjC
@@ -82076,7 +81875,7 @@ jus
jus
jus
jus
-kLp
+gId
inl
xmP
gId
@@ -82333,9 +82132,9 @@ jQD
qst
fqo
jus
-kLp
+gId
wub
-kLp
+gId
gId
aaa
aaa
@@ -82847,7 +82646,7 @@ jus
qXM
jus
jus
-kLp
+gId
bEl
hiC
gId
@@ -83103,8 +82902,8 @@ nmT
nmT
tJh
nmT
-kLp
-kLp
+gId
+gId
lBz
tmZ
gId
diff --git a/_maps/map_files/Gladius/Gladius2.dmm b/_maps/map_files/Gladius/Gladius2.dmm
index 1a91a908571..9c2c4768ef1 100644
--- a/_maps/map_files/Gladius/Gladius2.dmm
+++ b/_maps/map_files/Gladius/Gladius2.dmm
@@ -11,8 +11,15 @@
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 4
},
+/obj/machinery/computer/atmos_control/tank/sm{
+ dir = 4;
+ input_tag = "sd_in";
+ name = "Stormdrive Mix Monitor";
+ output_tag = "sd_out";
+ sensors = list("sd_sense"="Rx Mix")
+ },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"aaD" = (
/obj/structure/chair/stool,
/turf/open/floor/durasteel,
@@ -52,6 +59,9 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
+"acg" = (
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"acl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -77,26 +87,11 @@
/area/chapel/main)
"aeQ" = (
/obj/effect/turf_decal/ship/techfloor,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"afs" = (
/obj/machinery/door/airlock/ship/maintenance/defaultaccess,
/obj/machinery/door/firedoor/border_only{
@@ -167,15 +162,15 @@
/turf/open/space/basic,
/area/space/nearstation)
"ahJ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/effect/turf_decal/ship/techfloor{
dir = 4
},
-/obj/item/geiger_counter{
- desc = "It's capped at 3.6 Roentgen. Not great, not terrible.";
- name = "\improper Dossimiter"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4;
+ filter_types = list("nucleium");
+ name = "Nucleium Scrubber"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"ahV" = (
/obj/structure/disposalpipe/segment{
@@ -437,15 +432,7 @@
/area/space/nearstation)
"anZ" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/space/basic,
/area/space/nearstation)
"aoq" = (
@@ -638,13 +625,18 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"auR" = (
-/obj/effect/turf_decal/ship/shutoff,
-/obj/machinery/atmospherics/components/binary/pump/rbmk_output{
- dir = 1;
- name = "Coolant Outlet"
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 1
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
+ dir = 1
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"avp" = (
/obj/effect/turf_decal/ship/techfloor{
dir = 5
@@ -652,6 +644,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/light/floor,
/turf/open/floor/engine,
/area/engine/engineering/ftl_room)
"avB" = (
@@ -680,7 +673,7 @@
icon_state = "1-2"
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"axa" = (
/obj/machinery/door/airlock/ship/external/glass{
name = "Escape Shuttle Dock";
@@ -782,7 +775,7 @@
"aAx" = (
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"aAD" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -872,11 +865,9 @@
/obj/item/analyzer,
/obj/machinery/computer/ship/viewscreen,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"aDN" = (
-/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
- dir = 1
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"aEd" = (
@@ -928,6 +919,11 @@
/obj/structure/curtain/obscuring/grey,
/turf/open/floor/plating,
/area/lawoffice)
+"aFI" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"aFK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -986,9 +982,13 @@
/turf/open/floor/monotile/dark,
/area/engine/break_room)
"aHo" = (
-/obj/effect/turf_decal/pool,
-/obj/effect/turf_decal/ship/delivery/yellow,
-/turf/open/floor/monotile/dark,
+/obj/effect/turf_decal/pool{
+ layer = 2.0392
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"aHy" = (
/obj/effect/spawner/room/fivexthree,
@@ -1016,7 +1016,7 @@
dir = 1
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"aIU" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -1059,6 +1059,9 @@
},
/obj/item/reagent_containers/food/snacks/onionrings,
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/crew_quarters/kitchen)
"aLw" = (
@@ -1107,7 +1110,7 @@
name = "Rx Mix Tank Output"
},
/turf/open/floor/engine/vacuum/light,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"aMV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -1277,10 +1280,12 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/aft)
"aUk" = (
-/obj/effect/spawner/structure/window/reinforced/ship,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 4
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"aUw" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -1371,6 +1376,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/item/trash/cheesie,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"aYj" = (
@@ -1420,7 +1426,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"baw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1591,20 +1597,20 @@
/turf/open/floor/plasteel/grid/steel,
/area/engine/atmos)
"bhf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/lattice/catwalk/over/ship,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/turf/open/floor/plating,
+/obj/machinery/light,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"bhg" = (
/obj/effect/turf_decal/tile/neutral{
@@ -1732,7 +1738,7 @@
dir = 4
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"blS" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -1791,7 +1797,7 @@
},
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bou" = (
/obj/effect/turf_decal,
/obj/machinery/atmospherics/components/binary/valve/digital{
@@ -1802,22 +1808,6 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
-"box" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
"boE" = (
/obj/machinery/computer/security/telescreen/entertainment,
/turf/closed/wall/ship,
@@ -1830,12 +1820,15 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"boM" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/door/firedoor/border_only/directional/north,
+/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/hatch/glass{
+ name = "Armor Pump";
+ req_one_access_txt = "10"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"bpb" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -1867,9 +1860,11 @@
/turf/open/floor/plasteel/techmaint,
/area/engine/engine_smes)
"bpQ" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
+/obj/machinery/camera/autoname,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"bpR" = (
/obj/effect/turf_decal/tile/ship/full/blue,
@@ -1932,7 +1927,7 @@
dir = 4
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"brX" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -1954,6 +1949,11 @@
icon_state = "platingdmg3"
},
/area/maintenance/nsv/deck2/frame1/starboard)
+"bsR" = (
+/obj/structure/closet/firecloset/full,
+/obj/item/storage/toolbox/mechanical,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"btp" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1972,25 +1972,19 @@
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"btC" = (
+/obj/effect/turf_decal/ship/shutoff,
+/obj/machinery/atmospherics/components/binary/pump{
+ name = "Cooler To AGCNR"
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"btH" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/machinery/atmospherics/pipe/simple/purple/hidden,
-/obj/structure/railing{
- dir = 1
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 10
},
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/rbmk,
-/obj/machinery/computer/reactor/stats,
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/turf/open/space/basic,
+/area/space/nearstation)
"btY" = (
/obj/machinery/door/airlock/ship/hatch{
frequency = 1449;
@@ -2026,6 +2020,12 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/aft)
+"bum" = (
+/obj/machinery/camera/autoname{
+ dir = 4
+ },
+/turf/open/floor/plasteel/techmaint,
+/area/engine/engineering/reactor_core)
"buD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2119,7 +2119,7 @@
"bwj" = (
/obj/machinery/atmospherics/pipe/manifold/purple/visible,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"bwt" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/ship/delivery/yellow,
@@ -2132,19 +2132,16 @@
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss)
"bwC" = (
-/obj/machinery/camera/autoname,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/ftl_room)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/closed/wall/r_wall/ship,
+/area/engine/engineering/reactor_core)
"bxf" = (
/obj/machinery/atmospherics/components/binary/valve/digital{
dir = 4;
name = "Rx Mix Line to Vent"
},
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"bxr" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -2194,27 +2191,6 @@
},
/turf/open/floor/durasteel,
/area/crew_quarters/dorms)
-"byq" = (
-/obj/effect/turf_decal/pool{
- dir = 8
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/camera/autoname{
- dir = 1
- },
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/modular_computer/console/preset/engineering{
- dir = 4
- },
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"bzu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -2294,7 +2270,7 @@
dir = 4
},
/obj/machinery/meter{
- name = "FTL Waste to Cooler"
+ name = "FTL Waste to Scrubbers"
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
@@ -2323,7 +2299,7 @@
/area/hallway/nsv/deck2/frame1/starboard)
"bFg" = (
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bFk" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
@@ -2349,15 +2325,6 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/storage)
-"bGy" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"bGK" = (
/obj/effect/spawner/structure/window/reinforced/ship,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
@@ -2412,7 +2379,7 @@
name = "Pipe Control Station"
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bHP" = (
/obj/machinery/conveyor{
id = "garbage"
@@ -2423,6 +2390,22 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"bHZ" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/engineering{
+ name = "FTL Room";
+ req_one_access_txt = "10"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/ftl_room)
"bIj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2472,15 +2455,16 @@
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
"bJs" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1;
- name = "Coolant Input"
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"bJC" = (
/obj/structure/table/reinforced,
@@ -2491,7 +2475,7 @@
dir = 8
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bJI" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/tile/neutral,
@@ -2602,9 +2586,7 @@
name = "StormDrive Fuel Tank Sensor"
},
/turf/open/floor/engine/vacuum/light,
-/area/engine/engineering/reactor_core{
- name = "Stormdrive Mix Sensor"
- })
+/area/engine/stormdrive)
"bMQ" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -2695,7 +2677,7 @@
},
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bQK" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2711,12 +2693,12 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bQU" = (
/obj/structure/chair/office,
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bRi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -2759,7 +2741,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bSo" = (
/obj/structure/disposalpipe/junction/flip{
dir = 4
@@ -2838,7 +2820,7 @@
dir = 8
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bXU" = (
/obj/machinery/door/airlock/ship/hatch{
name = "Reactor Core Access";
@@ -2864,7 +2846,7 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"bYf" = (
/obj/machinery/suit_storage_unit/mining/eva,
/obj/effect/turf_decal/stripes/corner{
@@ -2885,8 +2867,11 @@
/turf/open/floor/monotile/light,
/area/crew_quarters/kitchen)
"bYY" = (
-/obj/machinery/camera/autoname,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
+/obj/effect/turf_decal/ship/shutoff,
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "Hot Loop To Cooler"
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"bZO" = (
@@ -3023,18 +3008,18 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"ccU" = (
-/obj/machinery/door/airlock/ship/external/glass{
- dir = 1;
- req_one_access_txt = "10; 24"
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
+ dir = 4
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"cdt" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
@@ -3103,6 +3088,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/engine,
/area/engine/engineering/ftl_room)
"cfW" = (
@@ -3201,7 +3187,7 @@
},
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"cis" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -3229,14 +3215,17 @@
/area/crew_quarters/dorms)
"ciX" = (
/obj/effect/turf_decal/ship/techfloor{
- dir = 5
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1;
+ filter_types = list("nucleium");
+ name = "Nucleium Scrubber"
},
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/ship/outline,
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"ciY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/turf/open/floor/plasteel/ridged/steel,
@@ -3402,18 +3391,18 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"cnA" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 4
- },
/obj/machinery/light{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
"cnV" = (
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"cnX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -3470,13 +3459,14 @@
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
"coK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/advanced_airlock_controller/directional/east,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"cpe" = (
/obj/machinery/door/firedoor/border_only,
@@ -3674,11 +3664,19 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"ctr" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden,
+/obj/machinery/meter,
+/obj/structure/chair/office/light{
+ dir = 1
+ },
+/obj/effect/landmark/start/station_engineer,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+ dir = 6
+ },
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"ctB" = (
/obj/structure/chair/office{
@@ -3687,6 +3685,18 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/carpet/purple,
/area/vacant_room/office)
+"ctF" = (
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"ctI" = (
/obj/machinery/light/small{
dir = 4
@@ -3709,13 +3719,6 @@
icon_state = "platingdmg1"
},
/area/maintenance/nsv/deck2/frame1/starboard)
-"cuc" = (
-/obj/structure/sign/ship/radiation{
- dir = 1;
- pixel_y = -32
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"cuy" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/tile/yellow,
@@ -3875,7 +3878,7 @@
/turf/open/floor/plasteel/dark,
/area/engine/storage)
"czX" = (
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"czY" = (
@@ -3971,19 +3974,26 @@
/turf/closed/wall/ship,
/area/maintenance/nsv/deck2/port/aft)
"cCx" = (
-/obj/effect/turf_decal/ship/techfloor/grid{
- dir = 4;
- pixel_x = 1
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/obj/effect/turf_decal/ship/techfloor{
dir = 1
},
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"cCz" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -4006,9 +4016,14 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"cCS" = (
-/obj/structure/table/reinforced,
-/obj/item/wrench,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/trinary/filter/flipped/on{
+ dir = 8;
+ name = "Loop Purge Filter"
+ },
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"cCX" = (
/obj/effect/turf_decal/tile/red,
@@ -4131,7 +4146,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"cFQ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -4196,8 +4211,8 @@
/area/storage/primary)
"cHX" = (
/obj/effect/turf_decal/ship/techfloor,
-/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+ dir = 4
},
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
@@ -4235,7 +4250,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -4243,7 +4257,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"cIV" = (
/obj/machinery/door/firedoor/border_only{
@@ -4385,24 +4399,13 @@
/turf/open/floor/durasteel,
/area/crew_quarters/locker)
"cLF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/ship/shutoff,
-/obj/machinery/atmospherics/components/binary/pump/rbmk_input{
- name = "Coolant inlet"
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/space/basic,
+/area/space/nearstation)
"cLG" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
+/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/turf/open/space/basic,
@@ -4477,7 +4480,7 @@
"cPO" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"cPZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -4521,6 +4524,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"cRT" = (
@@ -4628,6 +4632,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/monotile/dark,
/area/hydroponics)
+"cTS" = (
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"cTY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4804,11 +4812,8 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"dbM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 5
- },
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 5
+ dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
@@ -4959,16 +4964,20 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"dhR" = (
-/obj/machinery/light/floor,
-/turf/open/indestructible/sound/pool/spentfuel,
+/obj/effect/spawner/structure/window/reinforced/ship,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/plating,
/area/engine/engineering/reactor_core)
"diH" = (
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/machinery/door/firedoor/border_only/directional/north,
+/obj/machinery/door/airlock/ship/maintenance{
+ name = "Maintenance Access Reactor Core";
+ req_one_access_txt = "10"
},
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"diY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -5176,11 +5185,13 @@
/turf/open/floor/engine/o2,
/area/engine/atmos)
"drj" = (
-/obj/effect/turf_decal/ship/techfloor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 4
+ dir = 5
},
-/turf/open/floor/plasteel/ridged/steel,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"drp" = (
/turf/closed/wall/r_wall/ship,
@@ -5289,10 +5300,6 @@
"dvQ" = (
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
-"dwf" = (
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"dwi" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 4
@@ -5461,8 +5468,17 @@
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"dBA" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8;
+ name = "Direct Moderator Input"
+ },
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"dCk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -5636,9 +5652,10 @@
},
/area/maintenance/nsv/deck2/frame1/central)
"dFy" = (
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space)
+/obj/effect/spawner/structure/window/reinforced/ship,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating,
+/area/engine/engineering/reactor_core)
"dFK" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "N2 to Rx Mix"
@@ -5851,9 +5868,8 @@
/area/maintenance/nsv/deck2/port/fore)
"dKB" = (
/obj/machinery/door/firedoor/border_only/directional/east,
-/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"dKK" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/line,
@@ -5885,8 +5901,7 @@
},
/obj/structure/table,
/obj/item/stack/sheet/duranium/fifty,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plasteel/techmaint,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"dLi" = (
/obj/machinery/light/small{
@@ -5916,10 +5931,11 @@
/turf/open/floor/plasteel/tech/grid,
/area/quartermaster/warehouse)
"dMm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"dMo" = (
@@ -6272,20 +6288,8 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"dXw" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/purple/hidden,
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/meter,
-/obj/structure/chair/office/light{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
-"dXE" = (
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 6
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
@@ -6300,6 +6304,15 @@
/obj/effect/turf_decal/ship/outline,
/turf/open/floor/monotile/dark,
/area/engine/atmos)
+"dXT" = (
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"dYa" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -6588,14 +6601,10 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"eho" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4;
- filter_types = list("nucleium");
- name = "Nucleium Scrubber"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"ehN" = (
@@ -6670,20 +6679,13 @@
/turf/open/floor/engine/vacuum/light,
/area/engine/atmos)
"ekj" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 6
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
+/obj/effect/turf_decal/ship/techfloor,
/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/machinery/armour_plating_nanorepair_pump/aft_starboard{
- apnw_id = "comedy"
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"ekr" = (
/obj/machinery/light/small{
dir = 8
@@ -6880,15 +6882,10 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/aft)
"eqM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"erw" = (
/obj/effect/turf_decal/tile/neutral{
@@ -6913,11 +6910,12 @@
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"erS" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 8
+/obj/machinery/camera/autoname{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden,
-/turf/open/floor/plasteel/ridged/steel,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"esl" = (
/obj/structure/reagent_dispensers/water_cooler,
@@ -7095,10 +7093,6 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
-"exn" = (
-/obj/effect/spawner/structure/window/reinforced/indestructable,
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
"exo" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -7353,14 +7347,16 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"eDw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/door/airlock/ship/external/glass{
+ dir = 1;
+ req_one_access_txt = "10; 24"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"eDJ" = (
/turf/open/floor/carpet/purple,
@@ -7410,6 +7406,11 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
+"eEy" = (
+/obj/machinery/light/small,
+/obj/structure/closet/firecloset,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"eEE" = (
/obj/structure/dresser,
/obj/structure/sign/poster/contraband/random{
@@ -7424,15 +7425,10 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"eFw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
- },
-/obj/structure/lattice/catwalk/over/ship,
+/obj/structure/closet/emcloset,
+/obj/machinery/light/small,
/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/area/maintenance/department/engine)
"eFC" = (
/turf/template_noop,
/area/maintenance/nsv/deck2/frame1/starboard)
@@ -7463,13 +7459,6 @@
},
/turf/open/floor/plating,
/area/shuttle/turbolift/tertiary)
-"eGA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"eGG" = (
/obj/machinery/door/firedoor/border_only{
dir = 1
@@ -7505,7 +7494,7 @@
dir = 8
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"eGU" = (
/obj/machinery/door/airlock/ship/hatch{
name = "Stormdrive Engine";
@@ -7518,8 +7507,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/firedoor/border_only/directional/north,
/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"eGZ" = (
/obj/machinery/pool_filter,
/turf/open/indestructible/sound/pool/spentfuel/wall,
@@ -7544,6 +7534,11 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/starboard)
+"eHq" = (
+/obj/structure/girder,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"eHu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
@@ -7562,15 +7557,12 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/kitchen)
"eIw" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/structure/sign/ship/radiation{
- dir = 4;
- pixel_x = -32
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/item/storage/box/lights/mixed,
+/obj/structure/closet/crate/engineering,
+/obj/item/stack/cable_coil/random,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"eIz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7583,8 +7575,9 @@
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
"eID" = (
+/obj/structure/sign/ship/space,
/turf/closed/wall/r_wall/ship,
-/area/space)
+/area/engine/engineering/reactor_core)
"eIR" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -7743,7 +7736,6 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"eMm" = (
-/obj/effect/landmark/event_spawn,
/obj/effect/landmark/nuclear_waste_spawner/strong,
/obj/machinery/atmospherics/components/binary/stormdrive_reactor{
reactor_id = 1
@@ -7752,7 +7744,7 @@
icon_state = "0-4"
},
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"eMI" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -7764,13 +7756,6 @@
"eNa" = (
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"eNf" = (
-/obj/effect/spawner/structure/window/reinforced/indestructable,
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
"eNw" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/syndicake,
@@ -8059,9 +8044,11 @@
/area/hallway/secondary/exit/departure_lounge)
"eYG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold4w/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"eYZ" = (
@@ -8109,10 +8096,10 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/aft)
"fap" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"fax" = (
/obj/item/stock_parts/subspace/transmitter,
@@ -8172,7 +8159,7 @@
dir = 4
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"fcd" = (
/obj/structure/chair/wood/normal{
dir = 8
@@ -8225,20 +8212,23 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/starboard/fore)
"fcX" = (
-/obj/effect/landmark/start/station_engineer,
-/obj/structure/chair/office{
- dir = 8;
- name = "Reactor Control Station"
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/item/toy/plush/lizardplushie{
+ name = "FTL Lizard Engineer"
+ },
+/obj/item/clothing/head/hardhat{
+ pixel_y = 8
},
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"fdu" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"fdz" = (
/obj/structure/chair/wood/normal{
dir = 4
@@ -8331,14 +8321,12 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"ffZ" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/structure/table/reinforced,
-/obj/machinery/computer/reactor/fuel_rods,
+/obj/machinery/computer/reactor/control_rods,
/obj/structure/railing{
- dir = 5
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/grid/techfloor/grid,
+/obj/effect/turf_decal/ship/techfloor/grid,
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"fgo" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -8442,14 +8430,12 @@
/turf/open/floor/carpet/red,
/area/crew_quarters/bar)
"fjd" = (
-/obj/effect/turf_decal/ship/techfloor{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light{
dir = 8
},
-/obj/machinery/atmospherics/components/trinary/filter/flipped/on{
- dir = 8;
- name = "Loop Purge Filter"
- },
-/turf/open/floor/plasteel/ridged/steel,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"fjh" = (
/obj/effect/turf_decal/tile/neutral{
@@ -8629,7 +8615,7 @@
/obj/effect/turf_decal/ship/outline,
/obj/machinery/light,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"fkF" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -8860,7 +8846,7 @@
"fqe" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"fql" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -9037,6 +9023,15 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
+"fvB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"fvF" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
@@ -9090,7 +9085,7 @@
},
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"fwO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -9417,11 +9412,6 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"fEV" = (
-/obj/effect/turf_decal/ship/shutoff,
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Hot Loop To Cooler"
- },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"fFD" = (
@@ -9429,9 +9419,17 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"fFK" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -9544,13 +9542,13 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/aft)
"fIf" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/components/trinary/filter/flipped/on{
- dir = 8;
- name = "Loop Purge Filter"
+/obj/machinery/atmospherics/components/trinary/nuclear_reactor/preset{
+ dir = 4
},
+/obj/effect/landmark/nuclear_waste_spawner/strong,
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"fIx" = (
@@ -9580,8 +9578,8 @@
dir = 4;
reactor_id = 1
},
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"fJD" = (
/obj/machinery/door/window{
base_state = "right";
@@ -9673,11 +9671,16 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"fLI" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/wrench,
+/obj/machinery/light{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden,
-/turf/open/floor/plasteel/ridged/steel,
+/obj/item/geiger_counter{
+ desc = "It's capped at 3.6 Roentgen. Not great, not terrible.";
+ name = "\improper Dossimiter"
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"fLO" = (
/obj/machinery/door/airlock/ship/external/glass{
@@ -9939,6 +9942,10 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"fSr" = (
+/obj/item/clothing/head/hardhat/weldhat/orange,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"fSs" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -10009,19 +10016,20 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
- dir = 8;
- name = "Nucleium Exhaust Cooler"
- },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
"fUQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1;
+ name = "Coolant Input"
},
+/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
dir = 4
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"fVb" = (
@@ -10217,6 +10225,7 @@
icon_state = "0-8"
},
/obj/structure/closet/radiation,
+/obj/item/shovel,
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"gau" = (
@@ -10645,6 +10654,9 @@
dir = 4
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/crew_quarters/kitchen)
"gla" = (
@@ -10653,11 +10665,10 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"gli" = (
/obj/structure/table/wood/fancy/black,
@@ -11070,7 +11081,7 @@
icon_state = "2-8"
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"gwK" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -11317,14 +11328,12 @@
/turf/open/floor/plasteel/dark,
/area/tcommsat/computer)
"gEc" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 6
+/obj/structure/sign/ship/radiation{
+ dir = 1;
+ pixel_y = -32
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"gEN" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/monotile/dark,
@@ -11518,12 +11527,20 @@
/turf/open/floor/monotile/dark,
/area/chapel/main)
"gKT" = (
-/obj/effect/turf_decal/ship/techfloor,
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 10
+ },
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/armour_plating_nanorepair_pump/aft_port{
+ apnw_id = "comedy"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"gLj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11866,7 +11883,7 @@
dir = 10
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"gWx" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -11940,8 +11957,14 @@
/area/hallway/nsv/deck2/aft)
"gXH" = (
/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/pool/corner{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"gXO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -11993,13 +12016,10 @@
/turf/open/floor/carpet/black,
/area/crew_quarters/bar)
"gZN" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/structure/table/reinforced,
-/obj/machinery/computer/reactor/control_rods,
-/obj/structure/railing{
- dir = 9
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/plasteel/grid/techfloor/grid,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"gZQ" = (
/obj/structure/table,
@@ -12305,7 +12325,7 @@
},
/obj/machinery/meter,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hgB" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -12454,15 +12474,13 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/kitchen)
"hlB" = (
-/obj/machinery/door/airlock/ship/external/glass{
- dir = 4;
- req_one_access_txt = "10; 24"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"hlJ" = (
/obj/structure/table/wood/fancy/red,
@@ -12539,7 +12557,7 @@
"hoe" = (
/obj/effect/spawner/structure/window/reinforced/ship,
/turf/open/space/basic,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hoq" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -12612,15 +12630,18 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"hqc" = (
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 8
},
/obj/machinery/camera/autoname,
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hqd" = (
/obj/machinery/door/airlock/ship/maintenance/defaultaccess{
name = "Maintenance Access Gym"
@@ -12684,7 +12705,7 @@
dir = 5
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hrw" = (
/turf/closed/wall/ship,
/area/engine/break_room)
@@ -12701,9 +12722,8 @@
dir = 4
},
/obj/machinery/door/firedoor/border_only/directional/east,
-/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hse" = (
/obj/effect/turf_decal/arrows,
/obj/effect/turf_decal/stripes/line{
@@ -12739,19 +12759,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/visible/layer2,
/turf/open/floor/monotile/dark,
/area/engine/atmos)
-"hup" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 8
- },
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"huL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -12772,6 +12779,7 @@
name = "FTL Room";
req_one_access_txt = "10"
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
"hvi" = (
@@ -12912,7 +12920,7 @@
name = "Rx Mix Output"
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hyS" = (
/obj/structure/table/wood,
/obj/item/folder{
@@ -12967,27 +12975,16 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/aft)
"hAx" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/lattice/catwalk/over/ship,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/landmark/start/station_engineer,
/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 5
+ icon_state = "4-8"
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"hAZ" = (
/obj/item/radio/intercom/directional/west,
@@ -13130,8 +13127,9 @@
/turf/open/floor/durasteel,
/area/crew_quarters/dorms)
"hFy" = (
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hFT" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
@@ -13615,7 +13613,7 @@
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste,
/turf/open/space/basic,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"hVa" = (
/obj/machinery/status_display/evac/east,
/obj/machinery/camera/autoname{
@@ -13860,22 +13858,6 @@
},
/turf/open/floor/carpet/purple,
/area/vacant_room/office)
-"ick" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/structure/lattice/catwalk/over/ship,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
"icA" = (
/obj/effect/spawner/room/fivexfour,
/turf/template_noop,
@@ -13901,7 +13883,7 @@
dir = 6
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"idn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -14050,10 +14032,7 @@
/area/engine/storage)
"igx" = (
/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/green/visible{
- dir = 5
+ icon_state = "2-4"
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
@@ -14254,7 +14233,7 @@
pixel_x = 8
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"ilL" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -14305,7 +14284,7 @@
dir = 1
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"imS" = (
/obj/machinery/door/airlock/ship/public{
name = "Cold Room";
@@ -14525,8 +14504,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"iqL" = (
/obj/structure/lattice/catwalk,
@@ -14556,7 +14534,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"iss" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -14639,7 +14617,7 @@
"itD" = (
/obj/structure/extinguisher_cabinet/east,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"itG" = (
/obj/structure/rack,
/obj/item/export_scanner,
@@ -14807,7 +14785,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"iwq" = (
/turf/closed/wall/ship,
/area/quartermaster/miningoffice)
@@ -14864,24 +14842,10 @@
},
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/aft)
-"iyE" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"izp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"izr" = (
/obj/item/radio/intercom/directional/west,
@@ -14891,15 +14855,10 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen/coldroom)
"izu" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8;
- filter_types = list("nucleium");
- name = "Nucleium Scrubber"
- },
-/turf/open/floor/plasteel/ridged/steel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"iAz" = (
/obj/structure/cable{
@@ -14910,18 +14869,22 @@
/area/quartermaster/warehouse)
"iBa" = (
/obj/effect/turf_decal/tile/yellow{
- dir = 8
+ dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"iBp" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -15240,14 +15203,6 @@
},
/turf/closed/wall/ship,
/area/quartermaster/sorting)
-"iLT" = (
-/obj/structure/closet/radiation,
-/obj/item/shovel,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"iLU" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral,
@@ -15257,13 +15212,14 @@
/turf/open/floor/monotile/dark,
/area/chapel/main)
"iLY" = (
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8;
+ dir = 4;
name = "Direct Moderator Input"
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/grid/techfloor/grid,
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 6
+ },
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"iMs" = (
/obj/machinery/computer/ship/munitions_computer/east,
@@ -15329,8 +15285,10 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"iOH" = (
-/obj/structure/extinguisher_cabinet/north,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"iOW" = (
/mob/living/simple_animal/hostile/retaliate/goat{
@@ -15433,15 +15391,14 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"iRZ" = (
/obj/structure/table/reinforced,
/obj/machinery/newscaster/directional/east,
/obj/item/book/manual/wiki/rbmk,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"iSm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -15895,14 +15852,24 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"jgT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/purple/hidden,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/book/manual/wiki/rbmk,
+/obj/machinery/computer/reactor/stats,
+/obj/effect/turf_decal/ship/techfloor,
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"jgW" = (
/obj/structure/bookcase/manuals/medical,
@@ -15910,10 +15877,14 @@
/area/library)
"jhd" = (
/obj/effect/turf_decal/pool{
- dir = 4
+ dir = 4;
+ layer = 2.0392
},
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"jhs" = (
/obj/structure/bookcase/manuals/research_and_development,
/turf/open/floor/wood,
@@ -16072,9 +16043,12 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"jmA" = (
-/obj/effect/turf_decal/pool,
-/obj/effect/turf_decal/ship/delivery/yellow,
-/turf/open/floor/plasteel/techmaint,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/item/pipe_dispenser,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"jnp" = (
/obj/structure/cable{
@@ -16139,6 +16113,10 @@
},
/turf/open/floor/monotile/dark,
/area/engine/atmos)
+"joK" = (
+/obj/structure/chair/fancy/sofa/old,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"jpd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -16411,10 +16389,11 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"jwp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -16490,21 +16469,11 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"jyU" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/landmark/zebra_interlock_point,
-/obj/machinery/door/airlock/ship/engineering{
- name = "FTL Room";
- req_one_access_txt = "10"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/ftl_room)
+/area/engine/engineering/reactor_core)
"jyZ" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -16666,8 +16635,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"jDb" = (
/obj/effect/landmark/start/assistant,
@@ -16744,9 +16712,11 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/aft)
"jDN" = (
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/machinery/door/firedoor/border_only/directional/west,
/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel/dark,
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/monotile/dark,
/area/engine/engineering/reactor_core)
"jEx" = (
/obj/effect/turf_decal/stripes/line{
@@ -16840,9 +16810,14 @@
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
"jHn" = (
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
/obj/effect/turf_decal/pool/corner,
+/obj/machinery/door/window/eastleft{
+ req_one_access_txt = "10"
+ },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"jHY" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -16872,12 +16847,24 @@
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
+ },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"jJx" = (
/obj/structure/bookcase/random/fiction,
/obj/machinery/firealarm/directional/west,
@@ -17017,6 +17004,15 @@
},
/turf/open/floor/carpet/purple,
/area/vacant_room/office)
+"jNm" = (
+/obj/effect/turf_decal/pool{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"jNR" = (
/obj/structure/chair/office,
/obj/structure/cable{
@@ -17089,14 +17085,8 @@
/turf/open/floor/monotile/dark,
/area/quartermaster/miningdock)
"jPZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/closed/wall/ship,
+/area/engine/stormdrive)
"jRq" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/effect/turf_decal/tile/ship/half/green{
@@ -17105,13 +17095,13 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"jRu" = (
-/obj/effect/landmark/nuclear_waste_spawner,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/ship/outline,
-/turf/open/floor/plasteel/ridged/steel,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"jRJ" = (
/obj/effect/turf_decal/tile/neutral,
@@ -17150,6 +17140,15 @@
},
/turf/open/floor/carpet/ship,
/area/chapel/office)
+"jSH" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"jSX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -17268,17 +17267,20 @@
/turf/open/floor/plating,
/area/engine/atmos)
"jVR" = (
-/obj/effect/turf_decal/ship/techfloor/grid{
- dir = 1
- },
/obj/effect/turf_decal/ship/techfloor{
- dir = 1
+ dir = 9
},
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/armour_plating_nanorepair_pump/forward_port{
+ apnw_id = "comedy"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"jVY" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/stripes/line{
@@ -17426,7 +17428,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"kah" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
dir = 4
@@ -17478,6 +17480,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/engine,
/area/engine/engineering/ftl_room)
"kci" = (
@@ -17507,10 +17510,11 @@
/turf/open/floor/monotile/dark,
/area/quartermaster/miningoffice)
"kdi" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 6
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/extinguisher_cabinet/north,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"kdP" = (
@@ -17589,7 +17593,7 @@
"kfP" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"kfS" = (
/obj/machinery/computer/atmos_control/tank/air_tank,
/obj/effect/turf_decal/tile/ship/blue{
@@ -17645,16 +17649,6 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/secondary/exit/departure_lounge)
-"kgD" = (
-/obj/effect/turf_decal/pool,
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
"kgF" = (
/obj/machinery/lazylift_button,
/turf/closed/wall/ship,
@@ -17779,6 +17773,21 @@
},
/turf/open/floor/monotile/dark,
/area/engine/atmos)
+"kmU" = (
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/armour_plating_nanorepair_pump/aft_starboard{
+ apnw_id = "comedy"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"kmV" = (
/obj/machinery/door/firedoor/border_only{
dir = 1
@@ -18058,7 +18067,7 @@
dir = 1
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"kvS" = (
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -18098,6 +18107,12 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/disposal)
+"kyz" = (
+/obj/machinery/camera/autoname{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"kyD" = (
/obj/structure/ladder,
/turf/open/floor/engine/vacuum,
@@ -18142,16 +18157,16 @@
},
/turf/open/floor/monotile/dark,
/area/engine/atmos)
+"kzm" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/lootdrop/gloves,
+/obj/item/encryptionkey/headset_eng,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"kzO" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/ship/techfloor,
-/obj/machinery/atmospherics/components/binary/pump/rbmk_moderator{
- dir = 1;
- name = "Moderator Inlet"
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 10
},
-/obj/effect/turf_decal/ship/shutoff,
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
dir = 4
},
@@ -18336,12 +18351,8 @@
/turf/open/floor/wood,
/area/library)
"kFE" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"kGx" = (
/obj/effect/spawner/structure/window/reinforced/ship,
/obj/machinery/atmospherics/pipe/simple/green/hidden,
@@ -18350,11 +18361,11 @@
"kGQ" = (
/obj/effect/turf_decal/delivery/red,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"kGZ" = (
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"kHc" = (
/obj/structure/disposalpipe/segment,
/obj/structure/lattice/catwalk/over/ship/dark,
@@ -18420,6 +18431,7 @@
dir = 8
},
/obj/structure/closet/radiation,
+/obj/item/shovel,
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"kHV" = (
@@ -18612,7 +18624,7 @@
name = "Rx Mix to Vent"
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"kQu" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -18685,6 +18697,12 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/secondary/exit/departure_lounge)
+"kSD" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"kTc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -19015,7 +19033,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"ldw" = (
/obj/structure/rack,
/obj/item/stock_parts/matter_bin,
@@ -19122,16 +19140,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
-"lgE" = (
-/obj/machinery/camera/autoname{
- dir = 4
- },
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"lgO" = (
/obj/machinery/power/apc/auto_name/west,
/obj/structure/cable{
@@ -19188,7 +19196,7 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"lhB" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"lhJ" = (
@@ -19201,6 +19209,10 @@
/obj/machinery/gravity_generator/main/station,
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
+"lir" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"liJ" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
@@ -19609,6 +19621,23 @@
/obj/structure/cable,
/turf/open/floor/monotile/dark,
/area/engine/atmos)
+"ltf" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"ltG" = (
/obj/effect/turf_decal/tile/ship/green{
dir = 4
@@ -19670,10 +19699,14 @@
/turf/open/floor/carpet/purple,
/area/vacant_room/office)
"lus" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/plasteel/ridged/steel,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"luU" = (
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
@@ -19692,7 +19725,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"lwn" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -19881,7 +19914,7 @@
dir = 1
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"lCg" = (
/obj/machinery/holopad,
/turf/open/floor/wood,
@@ -20191,17 +20224,20 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 4
+ dir = 5
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"lJa" = (
/obj/machinery/airalarm/directional/north,
@@ -20298,10 +20334,10 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/dorms)
"lLe" = (
-/obj/item/trash/cheesie,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"lLf" = (
@@ -20310,7 +20346,7 @@
name = "starmap console"
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"lLj" = (
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
@@ -20421,12 +20457,20 @@
/turf/open/floor/plasteel/grid/steel,
/area/storage/primary)
"lOu" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"lOT" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/grown/wheat,
@@ -20455,7 +20499,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"lQa" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/curtain/obscuring/grey,
@@ -20626,12 +20670,8 @@
/turf/open/floor/wood,
/area/library)
"lTH" = (
-/obj/effect/turf_decal/pool/corner,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/obj/effect/turf_decal/pool,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"lTL" = (
/obj/structure/rack,
@@ -20801,12 +20841,13 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"lZA" = (
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/sign/ship/radiation{
+ dir = 4;
+ pixel_x = -32
},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"lZD" = (
/obj/structure/cable{
@@ -20864,12 +20905,6 @@
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
/area/hallway/secondary/service)
-"mbl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"mbN" = (
/obj/structure/lattice/catwalk/over/ship/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -21102,22 +21137,31 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"mgd" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/library)
"mgl" = (
/obj/effect/turf_decal/ship/techfloor{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1;
- filter_types = list("nucleium");
- name = "Nucleium Scrubber"
+ dir = 9
},
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/turf_decal/ship/outline,
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
+"mgo" = (
+/obj/effect/turf_decal/pool{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"mgs" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -21276,7 +21320,7 @@
dir = 8
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"mlI" = (
/obj/machinery/light_switch/west,
/obj/machinery/light{
@@ -21392,7 +21436,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive)
"mnD" = (
/obj/structure/sign/ship/radiation{
dir = 4;
@@ -21404,8 +21448,8 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"mnH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21434,37 +21478,30 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"mov" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/ship/techfloor{
dir = 8
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"mox" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/armour_plating_nanorepair_well{
- apnw_id = "comedy"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
},
/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
+"moG" = (
+/obj/structure/pool_ladder,
+/turf/open/indestructible/sound/pool/spentfuel/wall,
/area/engine/engineering/reactor_core)
"moM" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
@@ -21493,16 +21530,24 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/machinery/armour_plating_nanorepair_well{
+ apnw_id = "comedy"
+ },
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"mpv" = (
/obj/structure/closet/wardrobe/miner,
/obj/effect/turf_decal/stripes/line,
@@ -21585,15 +21630,12 @@
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
"msZ" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 9
- },
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/shuttle/engine/huge{
dir = 8
},
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
"mtJ" = (
/turf/open/floor/durasteel,
/area/crew_quarters/fitness/recreation)
@@ -21602,7 +21644,7 @@
dir = 4
},
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"muH" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -21734,21 +21776,12 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"mxv" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
- dir = 8
+ dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"mxF" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
@@ -22130,6 +22163,10 @@
},
/turf/open/floor/carpet/green,
/area/library)
+"mHB" = (
+/obj/machinery/atmospherics/pipe/manifold/brown/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/ftl_room)
"mIc" = (
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/structure/cable{
@@ -22178,6 +22215,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/machinery/light/floor,
/turf/open/floor/engine,
/area/engine/engineering/ftl_room)
"mJn" = (
@@ -22275,6 +22313,12 @@
/obj/effect/turf_decal/ship/delivery/yellow,
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss)
+"mOP" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"mPf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -22376,7 +22420,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"mRH" = (
/obj/machinery/advanced_airlock_controller/directional/west,
/obj/machinery/light/small{
@@ -22804,6 +22848,7 @@
"ncE" = (
/obj/machinery/door/firedoor/border_only/directional/north,
/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"ncH" = (
@@ -22975,14 +23020,12 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
"ngH" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"ngI" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -23351,7 +23394,7 @@
},
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"nsL" = (
/obj/item/computer_hardware/hard_drive/role/lawyer,
/obj/item/clothing/accessory/lawyers_badge,
@@ -23451,11 +23494,12 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"nvR" = (
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 8
},
-/obj/machinery/atmospherics/components/trinary/nuclear_reactor/preset{
- dir = 4
+/obj/machinery/atmospherics/components/trinary/filter/flipped/on{
+ dir = 8;
+ name = "Loop Purge Filter"
},
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
@@ -24038,6 +24082,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"nOM" = (
@@ -24159,7 +24204,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/obj/effect/spawner/structure/window/reinforced/ship,
/turf/open/space/basic,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"nRI" = (
/obj/structure/table/reinforced,
/obj/item/folder/red,
@@ -24204,7 +24249,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"nSX" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -24320,7 +24365,7 @@
/area/hallway/secondary/exit/departure_lounge)
"nVk" = (
/obj/machinery/atmospherics/components/binary/pump/layer4{
- name = "Cooled FTL Waste to Scrubber";
+ name = "FTL Waste to Scrubber";
on = 1
},
/turf/open/floor/plasteel/dark,
@@ -24505,21 +24550,21 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
"nZO" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"nZS" = (
/obj/machinery/seed_extractor,
/obj/machinery/light{
@@ -24674,7 +24719,7 @@
node2_concentration = 1.0
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"odG" = (
/obj/machinery/door/firedoor/border_only/directional/north,
/obj/machinery/door/firedoor/border_only/directional/south,
@@ -24804,11 +24849,12 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"ogH" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"ogP" = (
/obj/machinery/vending/cola/random,
@@ -24824,7 +24870,7 @@
/obj/machinery/atmospherics/pipe/manifold/purple/visible,
/obj/machinery/meter,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"ohy" = (
/obj/machinery/firealarm/directional/west,
/turf/open/floor/plasteel/grid/steel,
@@ -25074,6 +25120,7 @@
/obj/structure/closet/radiation,
/obj/item/tank/internals/oxygen/yellow,
/obj/item/clothing/mask/gas,
+/obj/item/shovel,
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"oqD" = (
@@ -25266,18 +25313,9 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/starboard/fore)
"oxt" = (
-/obj/structure/closet/crate/internals{
- anchored = 1
- },
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
-/obj/item/clothing/suit/space/skinsuit,
-/obj/item/clothing/suit/space/skinsuit,
-/obj/item/clothing/head/helmet/space/skinsuit,
-/obj/item/clothing/head/helmet/space/skinsuit,
-/turf/open/floor/plasteel/techmaint,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"oxx" = (
/obj/machinery/atmospherics/pipe/simple/brown/visible{
@@ -25353,9 +25391,12 @@
/turf/open/floor/monotile/light,
/area/tcommsat/computer)
"oAe" = (
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"oAg" = (
@@ -25445,9 +25486,10 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"oBJ" = (
-/obj/structure/extinguisher_cabinet/south,
+/obj/structure/closet/firecloset/full,
+/obj/machinery/light,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"oBX" = (
/obj/machinery/light_switch/south,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -25568,11 +25610,10 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"oFJ" = (
/obj/machinery/vending/engivend,
@@ -25783,27 +25824,6 @@
},
/turf/open/floor/monotile/dark,
/area/storage/primary)
-"oNF" = (
-/obj/effect/turf_decal/pool{
- dir = 8
- },
-/obj/structure/table/reinforced,
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/item/toy/plush/lizardplushie{
- name = "FTL Lizard Engineer"
- },
-/obj/item/clothing/head/hardhat{
- pixel_y = 8
- },
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"oOi" = (
/obj/machinery/atmospherics/pipe/simple/brown/hidden{
dir = 4
@@ -26058,16 +26078,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"oXL" = (
-/obj/machinery/camera/autoname{
- dir = 4
- },
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/obj/structure/chair/stool,
+/obj/item/screwdriver,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"oXO" = (
/obj/machinery/camera/autoname{
dir = 1
@@ -26184,6 +26200,13 @@
},
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
+"paT" = (
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/modular_computer/console/preset/engineering{
+ dir = 4
+ },
+/turf/open/floor/plasteel/techmaint,
+/area/engine/engineering/reactor_core)
"pbj" = (
/obj/machinery/announcement_system,
/obj/item/radio/intercom/directional/west,
@@ -26210,7 +26233,7 @@
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"pbC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -26312,6 +26335,21 @@
/obj/machinery/cell_charger,
/turf/open/floor/carpet/orange,
/area/engine/break_room)
+"pew" = (
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 5
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/armour_plating_nanorepair_pump/forward_starboard{
+ apnw_id = "comedy"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"pex" = (
/obj/structure/table,
/obj/item/clipboard,
@@ -26395,6 +26433,10 @@
/obj/machinery/camera/autoname,
/turf/open/floor/plating,
/area/storage/tech)
+"pgD" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"pgH" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/semki{
@@ -26683,10 +26725,6 @@
/obj/structure/table/reinforced,
/obj/machinery/computer/reactor/pump/rbmk_input,
/obj/machinery/camera/autoname,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"pnY" = (
@@ -27033,14 +27071,11 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"pxt" = (
/obj/structure/rack,
@@ -27090,20 +27125,9 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"pyg" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 9
- },
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/machinery/armour_plating_nanorepair_pump/forward_port{
- apnw_id = "comedy"
- },
+/obj/structure/extinguisher_cabinet/west,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"pyj" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 10
@@ -27115,7 +27139,7 @@
icon_state = "1-2"
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"pym" = (
/obj/machinery/firealarm/directional/south,
/turf/open/floor/monotile/dark,
@@ -27258,13 +27282,11 @@
"pFq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/components/binary/pump/layer2{
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
dir = 8;
- name = "Stormdrive Waste to FTL";
- target_pressure = 3000
+ name = "Stormdrive waste to FTL"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"pFt" = (
/obj/machinery/door/firedoor/border_only,
@@ -27318,12 +27340,17 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"pGD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/effect/turf_decal/ship/shutoff,
+/obj/machinery/atmospherics/components/binary/pump/rbmk_output{
+ dir = 1;
+ name = "Coolant Outlet"
},
/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
dir = 8
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"pGR" = (
@@ -27373,7 +27400,7 @@
icon_state = "0-4"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"pHV" = (
/obj/item/kirbyplants/random,
/obj/machinery/firealarm/directional/south,
@@ -27434,7 +27461,7 @@
name = "Rx Mix Tank Injector"
},
/turf/open/floor/engine/vacuum/light,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"pKa" = (
/obj/item/clothing/under/suit/sl{
desc = "Whoever wears this makes the rules.";
@@ -27495,19 +27522,22 @@
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
"pLv" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"pLA" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
},
+/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
dir = 10
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"pLD" = (
@@ -27574,14 +27604,15 @@
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
"pNf" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 4
+/obj/machinery/door/firedoor/border_only/directional/west,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/machinery/door/airlock/ship/maintenance{
+ name = "Maintenance Access Reactor Core";
+ req_one_access_txt = "10"
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/area/maintenance/department/engine)
"pNl" = (
/obj/machinery/computer/bounty{
dir = 4
@@ -27638,14 +27669,13 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"pOc" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 10
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
+ dir = 1
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 9
},
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"pOj" = (
/obj/effect/turf_decal/ship/techfloor{
@@ -27719,11 +27749,12 @@
},
/area/chapel/main)
"pQI" = (
-/obj/machinery/camera/autoname{
- dir = 1
+/obj/item/radio/intercom/directional/south,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+ dir = 9
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"pQN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -27745,7 +27776,7 @@
/obj/effect/turf_decal/delivery/white,
/obj/machinery/portable_atmospherics/canister/water_vapor,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"pRB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -27766,6 +27797,9 @@
dir = 4
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/crew_quarters/kitchen)
"pRK" = (
@@ -27947,7 +27981,7 @@
/obj/item/stack/cable_coil/random,
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"pWy" = (
/turf/closed/wall/r_wall/ship,
/area/engine/storage)
@@ -27966,9 +28000,8 @@
/turf/open/floor/plasteel/grid/techfloor/grid,
/area/engine/engine_smes)
"pWE" = (
-/obj/machinery/light{
- dir = 1
- },
+/obj/machinery/camera/autoname,
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"pWF" = (
@@ -28111,11 +28144,15 @@
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"qaD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/machinery/door/firedoor/border_only/directional/north,
+/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/machinery/door/airlock/ship/hatch/glass{
+ name = "Armor Pump";
+ req_one_access_txt = "10"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"qaO" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/techstorage/tcomms,
@@ -28138,7 +28175,7 @@
"qbs" = (
/obj/effect/spawner/structure/window/reinforced/indestructable,
/turf/open/floor/plating,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive)
"qcw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -28367,8 +28404,12 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/starboard/fore)
"qiW" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/closed/wall/r_wall/ship,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"qjq" = (
/obj/structure/cable{
@@ -28644,14 +28685,12 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"qoF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/ship/techfloor{
dir = 5
},
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/camera/autoname{
- dir = 4
- },
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/turf_decal/ship/outline,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"qpb" = (
/turf/open/floor/plasteel/techmaint,
@@ -28716,7 +28755,7 @@
"qrB" = (
/obj/effect/landmark/nuclear_waste_spawner,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"qrW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -28728,7 +28767,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"qsh" = (
/obj/structure/table,
/obj/item/clothing/head/soft/grey{
@@ -29172,7 +29211,7 @@
dir = 1
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"qDe" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -29436,9 +29475,9 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"qLX" = (
-/obj/effect/spawner/structure/window/reinforced/ship,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/portable_atmospherics/canister/toxins,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"qMI" = (
/obj/structure/table,
@@ -29504,23 +29543,17 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/over/ship,
/obj/machinery/atmospherics/pipe/simple/purple/hidden{
dir = 4
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"qOi" = (
-/obj/structure/closet/radiation,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/structure/chair/stool{
+ dir = 1
},
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"qOl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
@@ -29680,15 +29713,11 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms)
"qRm" = (
-/obj/machinery/light{
+/obj/machinery/light/small{
dir = 8
},
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"qRs" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
@@ -29758,6 +29787,9 @@
dir = 4
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/crew_quarters/kitchen)
"qTz" = (
@@ -29873,8 +29905,9 @@
"qVM" = (
/obj/effect/landmark/start/station_engineer,
/obj/machinery/particle_accelerator/control_box,
+/obj/structure/cable/yellow,
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"qVY" = (
/obj/machinery/recharger{
pixel_y = 4
@@ -30001,8 +30034,8 @@
dir = 8
},
/obj/machinery/light,
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"qYQ" = (
/obj/structure/chair/office{
dir = 4
@@ -30368,7 +30401,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"rhV" = (
/obj/machinery/door/airlock/ship/maintenance{
name = "Maintenance Access Warehouse";
@@ -30388,15 +30421,6 @@
},
/turf/open/floor/plasteel/grid/steel,
/area/hallway/secondary/exit/departure_lounge)
-"rio" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
"riE" = (
/turf/closed/wall/ship,
/area/hallway/nsv/deck2/frame1/central)
@@ -30783,7 +30807,7 @@
/area/maintenance/nsv/deck2/starboard/fore)
"rrA" = (
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"rrG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -30797,7 +30821,7 @@
name = "Emergency Moderator Input"
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"rth" = (
/obj/machinery/computer/ship/navigation/public{
dir = 1;
@@ -31024,27 +31048,26 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
"rAT" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 5
+/obj/effect/turf_decal/ship/techfloor/grid{
+ dir = 4;
+ pixel_x = 1
},
-/obj/structure/cable/yellow{
- icon_state = "0-8"
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 1
},
/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/armour_plating_nanorepair_pump/forward_starboard{
- apnw_id = "comedy"
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"rAU" = (
/obj/machinery/telecomms/broadcaster/preset_left,
/turf/open/floor/circuit/airless,
/area/tcommsat/server)
"rBx" = (
/turf/closed/wall/ship,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"rBA" = (
/obj/structure/closet/secure_closet/engineering_welding,
/obj/effect/turf_decal/tile/yellow{
@@ -31072,6 +31095,13 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/carpet/ship,
/area/quartermaster/qm)
+"rCQ" = (
+/obj/machinery/camera/autoname,
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
+ name = "Nucleium Exhaust Cooler"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/ftl_room)
"rCZ" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate{
@@ -31104,7 +31134,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"rEe" = (
/obj/effect/turf_decal/bot,
/obj/structure/cable{
@@ -31161,6 +31191,13 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
+"rFz" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/brown/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/ftl_room)
"rFC" = (
/obj/effect/turf_decal/ship/techfloor,
/turf/open/floor/plasteel/techmaint,
@@ -31213,6 +31250,20 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/engine/atmos)
+"rHn" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"rHB" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
@@ -31434,7 +31485,6 @@
/turf/closed/wall/ship,
/area/hallway/secondary/entry)
"rMK" = (
-/obj/machinery/firealarm/directional/south,
/obj/structure/closet/crate/engineering,
/obj/item/control_rod,
/obj/item/control_rod,
@@ -31442,7 +31492,7 @@
/obj/item/control_rod,
/obj/item/control_rod,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"rNc" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -31561,6 +31611,11 @@
},
/turf/open/floor/carpet/ship/red_carpet,
/area/crew_quarters/dorms)
+"rPJ" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance/six,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"rPV" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
@@ -31623,7 +31678,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"rRx" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -31806,11 +31861,8 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/kitchen)
"rWF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/engine,
+/area/engine/stormdrive)
"rWJ" = (
/obj/machinery/conveyor{
id = "garbage"
@@ -31991,7 +32043,9 @@
/area/quartermaster/qm)
"sdG" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+ dir = 5
+ },
/turf/open/space/basic,
/area/space/nearstation)
"sdM" = (
@@ -32079,7 +32133,7 @@
"sfL" = (
/obj/machinery/light,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"sfM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
@@ -32153,10 +32207,6 @@
/area/crew_quarters/dorms)
"shr" = (
/obj/machinery/airalarm/directional/north,
-/obj/machinery/door/airlock/ship/engineering{
- name = "Engineering Construction Storage";
- req_one_access_txt = "10;24"
- },
/turf/open/floor/plasteel/dark,
/area/nsv/engine/corridor)
"shB" = (
@@ -32279,13 +32329,13 @@
/turf/open/floor/monotile/dark,
/area/crew_quarters/kitchen)
"ski" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{
dir = 4
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4,
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/advanced_airlock_controller/directional/east,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"skL" = (
/obj/item/soap/deluxe,
@@ -32460,6 +32510,7 @@
/obj/machinery/door/firedoor/border_only/directional/north,
/obj/machinery/door/firedoor/border_only/directional/south,
/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"soP" = (
@@ -32697,7 +32748,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive)
"sww" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/yellow{
@@ -33008,6 +33059,12 @@
},
/turf/open/floor/plasteel/techmaint,
/area/engine/storage)
+"sFy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"sFM" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/tile/neutral{
@@ -33111,14 +33168,13 @@
/turf/open/floor/plasteel/grid/techfloor/grid/airless,
/area/tcommsat/server)
"sHA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/structure/closet/radiation,
+/obj/item/shovel,
+/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plating,
-/area/engine/engineering/reactor_core)
+/area/maintenance/department/engine)
"sHB" = (
/obj/structure/weightmachine/stacklifter,
/turf/open/floor/durasteel,
@@ -33447,12 +33503,12 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen/coldroom)
"sRH" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
dir = 9
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"sRW" = (
@@ -33600,6 +33656,19 @@
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
/area/security/checkpoint/customs)
+"sUN" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/reactor/fuel_rods,
+/obj/structure/railing{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/ship/techfloor/grid{
+ dir = 8;
+ pixel_y = -1
+ },
+/turf/open/floor/plasteel/techmaint,
+/area/engine/engineering/reactor_core)
"sUO" = (
/obj/structure/lattice/catwalk/over/ship/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -33721,7 +33790,7 @@
/area/lawoffice)
"sYp" = (
/turf/closed/wall/r_wall/ship,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive)
"sYr" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -33795,8 +33864,8 @@
/area/maintenance/disposal)
"taO" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/layer_manifold{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 6
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -33826,19 +33895,6 @@
},
/turf/open/floor/durasteel,
/area/hallway/secondary/exit/departure_lounge)
-"tbi" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 5
- },
-/obj/structure/sign/ship/radiation{
- dir = 4;
- pixel_x = -32
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
"tbu" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -33954,6 +34010,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
+"tfS" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/reactor_core)
"tfV" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -34188,9 +34251,11 @@
/turf/open/floor/plasteel/grid/steel,
/area/quartermaster/storage)
"tmD" = (
-/obj/structure/table/reinforced,
-/obj/item/pipe_dispenser,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"tmG" = (
/obj/structure/closet/crate{
@@ -34225,14 +34290,11 @@
/turf/open/floor/monotile/dark,
/area/hallway/secondary/entry)
"tnF" = (
-/obj/effect/turf_decal/ship/techfloor{
+/obj/machinery/light{
dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"tnO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34252,8 +34314,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"tol" = (
/obj/effect/turf_decal/tile/yellow{
@@ -34394,7 +34455,7 @@
"tqS" = (
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"tqU" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -34539,20 +34600,18 @@
/area/maintenance/nsv/deck2/port/aft)
"tws" = (
/obj/structure/cable/yellow{
- icon_state = "4-8"
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/purple/hidden{
- dir = 4
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"twu" = (
/obj/structure/disposalpipe/segment{
@@ -34588,13 +34647,8 @@
/turf/open/floor/durasteel,
/area/hydroponics/garden)
"twO" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"tyf" = (
/obj/effect/turf_decal/stripes/line,
@@ -34646,9 +34700,8 @@
/turf/open/floor/monotile/dark,
/area/chapel/main)
"tAQ" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"tBe" = (
/obj/machinery/computer/monitor{
dir = 1
@@ -34660,12 +34713,10 @@
/turf/open/floor/plasteel/techmaint,
/area/engine/engine_smes)
"tBL" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 10
- },
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"tBR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -34693,17 +34744,21 @@
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 4
},
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"tDt" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"tDM" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/bot,
@@ -34844,14 +34899,8 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"tHQ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/closed/wall/r_wall/ship,
+/area/maintenance/department/engine)
"tHX" = (
/obj/structure/stairs{
dir = 8
@@ -34943,13 +34992,13 @@
/turf/open/floor/durasteel,
/area/crew_quarters/fitness/recreation)
"tJf" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/sign/ship/radiation{
+ dir = 4;
+ pixel_x = -32
},
-/turf/open/floor/plasteel/ridged/steel,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"tJG" = (
/obj/machinery/door/airlock/ship/station/mining{
@@ -34971,10 +35020,20 @@
/turf/open/floor/monotile/dark,
/area/quartermaster/miningoffice)
"tJQ" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only/directional/north,
+/obj/machinery/door/firedoor/border_only/directional/south,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/hatch/glass{
+ name = "Armor Pump";
+ req_one_access_txt = "10"
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"tKn" = (
/obj/effect/turf_decal/ship/techfloor{
dir = 4
@@ -35006,8 +35065,6 @@
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
"tKY" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
@@ -35091,14 +35148,11 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"tMS" = (
-/obj/effect/turf_decal/ship/techfloor{
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 6
- },
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"tNa" = (
/mob/living/carbon/monkey/punpun,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -35140,9 +35194,8 @@
"tNK" = (
/obj/machinery/door/firedoor/border_only/directional/east,
/obj/machinery/camera/autoname,
-/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"tOG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -35337,6 +35390,24 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/monotile/dark,
/area/quartermaster/storage)
+"tUP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/machinery/door/firedoor/border_only/directional/west,
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"tVb" = (
/obj/machinery/modular_computer/console/preset/command{
dir = 8
@@ -35408,12 +35479,15 @@
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/ftl_room)
"tYa" = (
-/obj/effect/turf_decal/pool/corner{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
+/obj/effect/turf_decal/ship/shutoff,
+/obj/machinery/atmospherics/components/binary/pump/rbmk_input{
+ name = "Coolant inlet"
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"tYg" = (
/obj/structure/cable{
@@ -35447,14 +35521,16 @@
/turf/open/floor/monotile/dark,
/area/nsv/weapons/gauss)
"tZd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"tZx" = (
/obj/effect/decal/cleanable/dirt,
@@ -35506,7 +35582,7 @@
dir = 8
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"uau" = (
/obj/item/seeds/apple,
/obj/item/seeds/banana,
@@ -35527,6 +35603,11 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"ubp" = (
+/obj/structure/chair/fancy/sofa/old/left,
+/obj/item/storage/fancy/cigarettes/cigpack_robust,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"ubt" = (
/obj/machinery/camera/autoname{
dir = 4
@@ -35595,9 +35676,15 @@
/turf/open/floor/monotile/dark,
/area/hydroponics)
"udB" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 6
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/ship/techfloor,
+/obj/machinery/atmospherics/components/binary/pump/rbmk_moderator{
+ dir = 1;
+ name = "Moderator Inlet"
},
+/obj/effect/turf_decal/ship/shutoff,
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
dir = 4
},
@@ -35699,18 +35786,11 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"ujA" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/ship/techfloor{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1;
- name = "Coolant Input"
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"ujF" = (
/obj/machinery/light,
@@ -35747,20 +35827,17 @@
/turf/open/floor/plating,
/area/quartermaster/sorting)
"ulN" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/ship/techfloor/grid{
+ dir = 1
},
/obj/effect/turf_decal/ship/techfloor{
dir = 1
},
/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
+ icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"ulQ" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/tile/neutral{
@@ -35815,6 +35892,7 @@
name = "\improper Dossimiter"
},
/obj/item/pen,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"unj" = (
@@ -35903,11 +35981,18 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"upX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/machinery/door/firedoor/border_only/directional/west,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/machinery/door/airlock/ship/maintenance{
+ name = "Maintenance Access Reactor Core";
+ req_one_access_txt = "10"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/effect/landmark/zebra_interlock_point,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"uqv" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -35924,13 +36009,8 @@
/turf/open/floor/monotile/dark,
/area/quartermaster/office)
"uqE" = (
-/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/ship/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
-/turf/open/floor/plasteel/techmaint,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"uqK" = (
/obj/structure/bodycontainer/morgue{
dir = 2
@@ -36073,8 +36153,10 @@
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/ftl_room)
"utD" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
-/turf/open/floor/plasteel/techmaint,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"utH" = (
/obj/structure/table,
@@ -36082,16 +36164,20 @@
dir = 1
},
/obj/item/radio/intercom{
- pixel_y = 6;
- name = "Common Channel Intercom"
+ name = "Common Channel Intercom";
+ pixel_y = 6
},
/obj/item/radio/intercom{
- pixel_y = -5;
+ frequency = 1357;
name = "Engineering Channel Intercom";
- frequency = 1357
+ pixel_y = -5
},
/turf/open/floor/engine,
/area/engine/engineering/ftl_room)
+"uuh" = (
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"uup" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/lattice/catwalk/over/ship/dark,
@@ -36198,7 +36284,7 @@
dir = 8
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"uxt" = (
/obj/machinery/conveyor{
dir = 9;
@@ -36554,13 +36640,10 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"uHc" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"uHo" = (
@@ -36822,7 +36905,7 @@
dir = 10
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"uOL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -36914,7 +36997,7 @@
/area/hallway/secondary/exit/departure_lounge)
"uSu" = (
/turf/open/floor/engine/vacuum/light,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"uSU" = (
/obj/item/stack/cable_coil/random{
pixel_y = 4
@@ -36922,8 +37005,12 @@
/obj/machinery/atmospherics/pipe/simple/purple/visible{
dir = 8
},
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"uSW" = (
/obj/structure/lattice/catwalk/over/ship/dark,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -36993,7 +37080,7 @@
dir = 8
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"uUJ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -37065,7 +37152,6 @@
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
"uWN" = (
-/obj/structure/pool_ladder,
/turf/open/indestructible/sound/pool/spentfuel/wall,
/area/engine/engineering/reactor_core)
"uYx" = (
@@ -37123,12 +37209,17 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/secondary/exit/departure_lounge)
+"vay" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/lootdrop/maintenance/two,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"vaL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
-/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/plasteel/dark,
+/area/engine/stormdrive)
"vaX" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -37213,6 +37304,7 @@
name = "FTL Room";
req_one_access_txt = "10"
},
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
"vdG" = (
@@ -37518,24 +37610,8 @@
/turf/closed/wall/ship,
/area/shuttle/turbolift/secondary)
"vnX" = (
-/obj/effect/turf_decal/pool{
- dir = 8
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/ship/delivery/yellow,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/computer/monitor{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/effect/landmark/zebra_interlock_point,
-/turf/open/floor/plasteel/techmaint,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/engine/engineering/reactor_core)
"vop" = (
/obj/structure/disposalpipe/segment{
@@ -37739,7 +37815,7 @@
dir = 8
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"vtJ" = (
/obj/structure/lattice/catwalk/over/ship/dark,
/obj/structure/cable{
@@ -37752,6 +37828,18 @@
},
/turf/open/floor/plating,
/area/hallway/nsv/deck2/frame1/central)
+"vtP" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"vtW" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -37761,11 +37849,14 @@
},
/area/maintenance/department/crew_quarters/dorms)
"vua" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"vuH" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -37796,7 +37887,7 @@
dir = 5
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vuV" = (
/obj/machinery/firealarm/directional/south,
/turf/open/floor/carpet,
@@ -37850,12 +37941,10 @@
/turf/open/floor/plasteel/grid/steel,
/area/storage/primary)
"vvZ" = (
-/obj/effect/turf_decal/ship/shutoff,
-/obj/machinery/atmospherics/components/binary/pump{
- name = "Cooler To AGCNR"
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/obj/structure/closet/radiation,
+/obj/item/shovel,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
"vwh" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -37880,7 +37969,7 @@
dir = 4
},
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vwt" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/grid/steel,
@@ -38010,8 +38099,14 @@
/turf/open/floor/plasteel/grid/steel,
/area/engine/atmos)
"vBF" = (
-/obj/structure/sign/ship/space,
-/turf/closed/wall/r_wall/ship,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"vBG" = (
/obj/effect/turf_decal/stripes/line{
@@ -38107,12 +38202,14 @@
/turf/open/floor/plating,
/area/construction)
"vGo" = (
-/obj/item/radio/intercom/directional/south,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 9
+ dir = 6
},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/armour_pump)
"vGZ" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -38171,7 +38268,7 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vIH" = (
/obj/structure/table,
/obj/item/flashlight/lamp{
@@ -38188,7 +38285,7 @@
/obj/item/radio/intercom/directional/west,
/obj/machinery/atmospherics/pipe/simple/purple/visible,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vIP" = (
/obj/effect/landmark/start/atmospheric_technician,
/obj/structure/cable{
@@ -38242,6 +38339,12 @@
/obj/item/circuitboard/machine/telecomms/receiver,
/turf/open/floor/plasteel/dark,
/area/storage/tcom)
+"vKl" = (
+/obj/machinery/door/firedoor/border_only/directional/west,
+/obj/machinery/door/firedoor/border_only/directional/east,
+/obj/effect/landmark/zebra_interlock_point,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"vKy" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -38278,8 +38381,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"vLV" = (
/obj/structure/plasticflaps/opaque,
@@ -38326,7 +38428,7 @@
},
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vMl" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -38361,7 +38463,7 @@
/obj/item/clothing/glasses/meson/engine,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vNk" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -38540,8 +38642,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"vSg" = (
/obj/machinery/cryopod,
@@ -38607,6 +38708,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
+/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"vTQ" = (
@@ -38614,7 +38716,7 @@
dir = 8
},
/turf/open/floor/plasteel/ridged/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"vTY" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -38757,20 +38859,10 @@
/turf/open/floor/durasteel,
/area/hydroponics/garden)
"vYj" = (
-/obj/effect/turf_decal/ship/techfloor{
- dir = 10
- },
-/obj/structure/cable/yellow{
- icon_state = "0-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/armour_plating_nanorepair_pump/aft_port{
- apnw_id = "comedy"
- },
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc/auto_name/west,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/armour_pump)
"vYr" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -38815,7 +38907,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"wag" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -38955,8 +39047,8 @@
/turf/open/floor/durasteel,
/area/crew_quarters/locker)
"wde" = (
-/obj/machinery/atmospherics/pipe/manifold/green/visible{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+ dir = 6
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/ftl_room)
@@ -39043,11 +39135,15 @@
/turf/closed/wall/ship,
/area/security/checkpoint/engineering)
"wfU" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 9
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+ dir = 8
+ },
+/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
- dir = 9
+ dir = 6
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
@@ -39067,7 +39163,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/grid/steel,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"whD" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -39373,7 +39469,7 @@
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/monotile/dark,
-/area/engine/atmos)
+/area/engine/stormdrive/monitor)
"wrh" = (
/obj/machinery/telecomms/server/presets/security,
/obj/effect/turf_decal/tile/red{
@@ -39452,6 +39548,15 @@
},
/turf/open/floor/monotile/dark,
/area/hallway/secondary/entry)
+"wtw" = (
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/armour_pump)
"wtJ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -39597,7 +39702,7 @@
dir = 4
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"wxs" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -39637,12 +39742,11 @@
/turf/open/floor/plating,
/area/engine/atmos)
"wyB" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 4;
- name = "Direct Moderator Input"
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
},
-/turf/open/floor/plasteel/grid/techfloor/grid,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"wyF" = (
/obj/structure/grille,
@@ -39735,12 +39839,21 @@
dir = 8
},
/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/airlock/ship/engineering{
+ name = "Engineering Construction Storage";
+ req_one_access_txt = "10;24"
+ },
/turf/open/floor/monotile/dark,
/area/engine/storage)
"wAT" = (
/obj/machinery/telecomms/broadcaster/preset_right,
/turf/open/floor/circuit/airless,
/area/tcommsat/server)
+"wBd" = (
+/obj/item/lighter,
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"wBA" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/duranium/twenty,
@@ -39788,12 +39901,15 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"wDv" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 5
+/obj/machinery/door/airlock/ship/external/glass{
+ dir = 4;
+ req_one_access_txt = "10; 24"
},
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"wDT" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -39872,7 +39988,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"wFA" = (
/obj/machinery/photocopier,
/obj/machinery/newscaster/directional/west,
@@ -40181,10 +40297,14 @@
/turf/open/floor/plating,
/area/hallway/nsv/deck2/frame1/starboard)
"wPd" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8;
+ filter_types = list("nucleium");
+ name = "Nucleium Scrubber"
},
-/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"wPC" = (
@@ -40199,7 +40319,8 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"wPS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/ship/delivery/yellow,
/turf/open/floor/plasteel/dark,
/area/engine/engineering/reactor_core)
"wQb" = (
@@ -40263,8 +40384,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/landmark/start/station_engineer,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"wSW" = (
/turf/closed/wall/ship,
@@ -40287,7 +40407,7 @@
dir = 1
},
/turf/open/floor/engine,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"wUO" = (
/obj/effect/turf_decal/tile/ship/green{
dir = 1
@@ -40377,7 +40497,7 @@
dir = 4
},
/turf/open/floor/monotile/dark,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"wXe" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -40627,6 +40747,16 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/starboard)
+"xdL" = (
+/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/computer/monitor{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/techmaint,
+/area/engine/engineering/reactor_core)
"xep" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -40851,6 +40981,17 @@
},
/turf/open/floor/plating,
/area/construction)
+"xki" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"xkj" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -40873,10 +41014,19 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"xkX" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1;
+ name = "Coolant Input"
+ },
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering/reactor_core)
"xlt" = (
/obj/machinery/field/generator,
/turf/open/floor/plating,
@@ -41067,7 +41217,7 @@
dir = 8
},
/turf/closed/wall/r_wall/ship,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"xoM" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -41083,9 +41233,8 @@
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/frame1/starboard)
"xpz" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_core)
+/turf/closed/wall/r_wall/ship,
+/area/engine/armour_pump)
"xpH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -41116,8 +41265,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
"xrn" = (
/obj/structure/cable{
@@ -41590,6 +41738,9 @@
/obj/structure/extinguisher_cabinet/north,
/turf/open/floor/monotile/dark,
/area/hallway/nsv/deck2/frame1/central)
+"xGE" = (
+/turf/closed/wall/r_wall/ship,
+/area/engine/stormdrive/monitor)
"xGR" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 6
@@ -41764,12 +41915,16 @@
/turf/open/floor/monotile/dark,
/area/quartermaster/sorting)
"xLu" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/lattice/catwalk/over/ship,
-/turf/open/floor/plating,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space/skinsuit,
+/obj/item/clothing/suit/space/skinsuit,
+/obj/item/clothing/head/helmet/space/skinsuit,
+/obj/item/clothing/head/helmet/space/skinsuit,
+/obj/structure/closet/crate/internals,
+/turf/open/floor/plasteel/techmaint,
/area/engine/engineering/reactor_core)
"xMf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -41902,10 +42057,11 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"xQk" = (
-/obj/machinery/light{
- dir = 4
+/obj/effect/turf_decal/ship/techfloor,
+/obj/machinery/atmospherics/pipe/manifold/green/hidden/layer2{
+ dir = 1
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"xQs" = (
/obj/effect/turf_decal/tile/neutral,
@@ -42011,6 +42167,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/landmark/zebra_interlock_point,
/turf/open/floor/plating,
/area/maintenance/nsv/deck2/port/fore)
"xRW" = (
@@ -42029,7 +42186,7 @@
reactor_id = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"xSa" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -42082,7 +42239,7 @@
"xTK" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/dark,
-/area/engine/engineering/reactor_control)
+/area/engine/stormdrive/monitor)
"xTM" = (
/obj/machinery/vending/snack/random,
/turf/open/floor/durasteel,
@@ -42090,6 +42247,10 @@
"xUB" = (
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
+"xUD" = (
+/obj/structure/chair/fancy/sofa/old/right,
+/turf/open/floor/plating,
+/area/maintenance/nsv/deck2/frame1/starboard)
"xUE" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/machinery/light/small{
@@ -42103,7 +42264,7 @@
icon_state = "1-2"
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"xUW" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -42442,7 +42603,7 @@
dir = 8
},
/turf/open/floor/carpet/green,
-/area/engine/engineering/reactor_core)
+/area/engine/stormdrive)
"yhD" = (
/obj/item/assembly/prox_sensor,
/turf/open/floor/plating,
@@ -42495,10 +42656,13 @@
/turf/open/floor/monotile/dark,
/area/engine/atmos)
"yjc" = (
-/obj/structure/lattice/catwalk/over/ship,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/ship/techfloor{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/green/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/ridged/steel,
/area/engine/engineering/reactor_core)
"yjQ" = (
/obj/machinery/pipedispenser,
@@ -42507,14 +42671,15 @@
"ykJ" = (
/obj/machinery/atmospherics/pipe/simple/purple/hidden,
/turf/closed/wall/ship,
-/area/engine/atmos)
+/area/engine/stormdrive/monitor)
"ykV" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light{
+ dir = 4
},
-/turf/open/space/basic,
-/area/space/nearstation)
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/engineering/reactor_core)
"ykW" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
@@ -53765,24 +53930,24 @@ aaa
aaa
aaa
aaa
+ncg
+ncg
+ncg
+ncg
aaa
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
aaa
aaa
aaa
@@ -54020,30 +54185,30 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+ncg
+ncg
+ncg
+cCg
+cCg
+ncg
+uCi
+ncg
+cCg
+cCg
+cCg
+cCg
+ncg
+uCi
+ncg
+cCg
+cCg
+cCg
+cCg
+ncg
+uCi
+ncg
+ncg
+ncg
aaa
aaa
aaa
@@ -54274,44 +54439,44 @@ aaa
aaa
aaa
aaa
+uCi
+uCi
+uCi
+ncg
+cCg
+cCg
+ncg
+ncg
+ncg
aaa
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
aaa
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
+uCi
+ncg
+cCg
+ncg
+ncg
+ncg
+ncg
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-cxR
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-dFy
-dFy
-dFy
-dFy
-dFy
-dFy
-aaa
-dFy
-dFy
-dFy
-dFy
-dFy
-dFy
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
aaa
aaa
aaa
@@ -54531,45 +54696,45 @@ aaa
aaa
aaa
aaa
+uCi
aaa
aaa
+ncg
+ncg
+ncg
+ncg
aaa
+uCi
aaa
aaa
+uCi
aaa
aaa
+uCi
aaa
aaa
aaa
+uCi
aaa
aaa
+uCi
aaa
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-dFy
-eID
-eID
-eID
-eID
-dFy
-aaa
-dFy
-eID
-eID
-eID
-eID
-dFy
-aaa
+ncg
+ncg
+cCg
+cCg
+cCg
+ncg
+uCi
+ncg
+cCg
+cCg
+cCg
+cCg
+cCg
+ncg
+uCi
aaa
aaa
aaa
@@ -54788,45 +54953,45 @@ aaa
aaa
aaa
aaa
+uCi
aaa
aaa
aaa
aaa
+uCi
aaa
aaa
-aaa
-aaa
-aaa
-fiL
+uCi
fiL
-uaT
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
fiL
+msZ
+uCi
+uCi
+uCi
+uCi
+uCi
+uCi
+uCi
fiL
uaT
+uCi
aaa
aaa
aaa
+ncg
+ncg
+ncg
+ncg
+ncg
aaa
-dFy
-dFy
-dFy
-dFy
-dFy
-dFy
-aaa
-dFy
-dFy
-dFy
-dFy
-dFy
-dFy
-aaa
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
+ncg
+uCi
ncg
ncg
ncg
@@ -55045,43 +55210,43 @@ ncg
ncg
ncg
aaa
+uCi
aaa
aaa
aaa
aaa
-aaa
-aaa
-fiL
+uCi
fiL
-uaT
fiL
+msZ
fiL
fiL
+uCi
fiL
fiL
-uaT
+msZ
fiL
fiL
uaT
+uCi
fiL
fiL
-fiL
-fiL
+uCi
fiL
uaT
aaa
aaa
-cTt
+uCi
aaa
aaa
-cTt
+uCi
aaa
aaa
aaa
-cTt
+uCi
aaa
aaa
-cTt
+uCi
aaa
aaa
ncg
@@ -55302,43 +55467,43 @@ cCg
cCg
ncg
uCi
+uCi
+uCi
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-fiL
-fiL
-fiL
-fiL
-fiL
+uCi
+uCi
+uCi
fiL
fiL
+uCi
fiL
fiL
+uCi
fiL
fiL
+uCi
fiL
fiL
fiL
+uCi
fiL
fiL
+uCi
fiL
fiL
aaa
aaa
-cTt
+uCi
aaa
aaa
-cTt
+uCi
aaa
aaa
aaa
-cTt
+uCi
aaa
aaa
-cTt
+uCi
aaa
aaa
ncg
@@ -55560,31 +55725,31 @@ ncg
ncg
uCi
aaa
+qAk
+qAk
+qAk
aaa
-aaa
-aaa
-aaa
-aaa
-fiL
-fiL
-fiL
-ecj
-ecj
-ecj
+uCi
fiL
fiL
+uCi
+tHQ
+tHQ
+tHQ
fiL
fiL
+uCi
fiL
fiL
-ecj
-ecj
-ecj
fiL
+tHQ
+tHQ
+tHQ
+uCi
fiL
fiL
-cCg
-cCg
+tHQ
+hig
hig
hig
hig
@@ -55822,25 +55987,25 @@ ecj
iRB
ecj
ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
-ecj
+tHQ
+tHQ
+tHQ
+tHQ
+tBL
+tHQ
+tHQ
+tHQ
+tHQ
+tHQ
+tHQ
+tHQ
+tHQ
+vay
+tHQ
+tHQ
+tHQ
+tHQ
+tHQ
hig
hig
hig
@@ -56072,32 +56237,32 @@ cCg
cCg
cCg
cCg
-ecj
+cCg
ecj
wph
ecj
bpQ
eqM
-qoF
-vBF
+ecj
+ecj
eIw
tMS
qRm
-lgE
uqE
-bGy
-tbi
+uqE
+uqE
+uqE
ngH
pLv
-wMm
+uqE
diH
oXL
-ngH
-qOi
+kzm
qOi
-iLT
-iLT
-ecj
+uuh
+qRm
+uqE
+bsR
hig
mmi
mmi
@@ -56329,33 +56494,33 @@ cCg
cCg
cCg
cCg
-ecj
+cCg
ecj
nbM
-qiW
-bpQ
+ecj
+bJs
ski
xLu
-ccU
-yjc
+ecj
+ecj
pNf
-yjc
-rWF
-izp
-sHA
+ecj
+ecj
+vvZ
sHA
-izp
-izp
+vvZ
+eHq
+fvB
eFw
tHQ
-btC
-btC
-btC
-btC
-btC
-btC
+fSr
+dXT
+uqE
+tHQ
+aFI
+lir
cnV
-hig
+diH
mmi
jPo
chR
@@ -56589,28 +56754,28 @@ aaa
aaa
aaa
aaa
-ecj
+bwC
hlB
-ecj
+coK
oxt
-ecj
+eDw
lZA
-hup
+oxt
vua
-cLF
-jPZ
-ujA
-coK
-jgT
+ecj
+ecj
+ecj
+ecj
+ecj
upX
-eDw
-dXE
-btC
-btC
-btC
-btC
-btC
-btC
+ecj
+xpz
+xpz
+xpz
+xpz
+xpz
+xpz
+xpz
xpz
hig
tLz
@@ -56843,14 +57008,14 @@ ioS
ioS
ioS
ioS
-ioS
+auR
anZ
sdG
-wNz
-wDv
ecj
+wDv
ecj
ecj
+eID
iOH
twO
jRu
@@ -56858,15 +57023,15 @@ erS
fjd
izu
tJf
-xzq
+sFy
ogH
tZd
-mbl
+xpz
kFE
pyg
tnF
-tnF
-tnF
+pgD
+jSH
vYj
oBJ
hig
@@ -57101,32 +57266,32 @@ ioS
ioS
ioS
ioS
-ioS
-ioS
ilv
-tBL
-wNz
aUk
-vvZ
+fiL
+qAk
+uCi
+ecj
+ecj
kdi
wfU
-sfn
-rzf
+qiW
+tYa
lus
-rzf
+xkX
drj
gZN
wyB
-tZd
-dwf
-dwf
+xki
+xpz
+kFE
jVR
mov
-iyE
+mov
lOu
gKT
-cuc
-hig
+kFE
+wCH
mmi
oxx
sMx
@@ -57358,32 +57523,32 @@ ioS
ioS
ioS
ioS
-ioS
-ioS
jPd
-tAQ
-qAk
-wYF
+btH
+wNz
+wNz
+wNz
+dhR
btC
aDN
-czX
+pOc
mgl
-rzf
+ujA
nvR
wPd
kzO
-btH
+xzq
dXw
hAx
boM
-boM
+mOP
ulN
mxv
mox
nZO
aeQ
gEc
-jyU
+hig
igx
jPO
syC
@@ -57618,11 +57783,11 @@ ioS
ioS
ioS
ilv
-ykV
-xkX
-qLX
+qAk
+qAk
+wYF
+fEV
fEV
-eGA
dbM
sfn
rzf
@@ -57633,16 +57798,16 @@ ffZ
iLY
tws
tJQ
-tJQ
+vtP
cCx
iBa
mpp
jJc
fFD
vGo
-hig
-vXY
-oxx
+bHZ
+rFz
+mHB
sMx
ezy
lkh
@@ -57876,13 +58041,13 @@ ioS
ioS
jPd
taO
-uCi
-ecj
+cLF
+dFy
bYY
czX
eYG
ciX
-fLI
+rzf
fIf
eho
udB
@@ -57893,12 +58058,12 @@ qaD
fdu
rAT
tDt
-tDt
-tDt
+rHn
+ltf
ekj
pQI
hig
-bwC
+mmi
oxx
sMx
ezy
@@ -58138,25 +58303,25 @@ ecj
pWE
lhB
uHc
-wPS
-auR
+sfn
+rzf
fap
-bJs
-oAe
-btC
+rzf
+xQk
+sUN
dBA
bhf
-dXE
-btC
-btC
-btC
-btC
-btC
-btC
xpz
+kFE
+pew
+wtw
+wtw
+ctF
+kmU
+kyz
hig
-vXY
-oxx
+rCQ
+mHB
ylS
jRX
veB
@@ -58389,30 +58554,30 @@ ioS
ioS
ioS
jPd
-tsX
+ccU
uCi
ecj
-btC
-btC
+fLI
+jyU
oAe
-btC
+qoF
tmD
cCS
ahJ
-oAe
-btC
-dBA
+yjc
+gZN
+tfS
pxp
-rio
+xpz
jHn
jhd
-jhd
-jhd
-jhd
-jhd
+jNm
+jNm
+mgo
+jNm
gXH
hig
-vXY
+mmi
rNx
tpb
noA
@@ -58649,27 +58814,27 @@ ilv
tsX
uCi
wYF
-xzq
+jmA
jwp
pLA
dMm
pGD
-dMm
+vBF
fUQ
sRH
xzq
vTP
-box
-mbl
+qOa
+acg
lTH
-iWO
-wNe
+moG
+vwN
wNe
wNe
wNe
ecj
hig
-vXY
+mmi
ecJ
koX
koX
@@ -58904,7 +59069,7 @@ ioS
ioS
jPd
tsX
-tAQ
+qAk
wYF
dKS
iqF
@@ -58913,7 +59078,7 @@ wSA
pFq
izp
izp
-izp
+ykV
izp
izp
gla
@@ -58923,7 +59088,7 @@ eGZ
vwN
vwN
vwN
-vwN
+wNe
ecj
hig
wde
@@ -59166,21 +59331,21 @@ wYF
rwH
pGe
mVw
-btC
+qLX
tKY
-btC
+wPS
lCw
-xQk
+ecj
jDN
-btC
-box
-btC
-jmA
+jDN
+tUP
+jDN
+ecj
uWN
vwN
-dhR
vwN
vwN
+wNe
ecj
hig
cnA
@@ -59422,17 +59587,17 @@ aaa
ecj
rfm
xoL
-ecj
+sYp
cPO
pbu
cPO
-ecj
+sYp
xoL
pnV
-pOc
+nzs
qOa
-msZ
-kgD
+uuP
+vnX
iWO
wNe
wNe
@@ -59678,21 +59843,21 @@ anV
anV
anV
akM
-ecj
-hFy
+sYp
hFy
+rWF
mug
-hFy
+rWF
rMK
-ecj
+sYp
euY
gQy
-box
+qOa
qer
-tYa
+ecj
+vnX
+vnX
vnX
-oNF
-byq
ecj
ecj
ecj
@@ -59935,21 +60100,21 @@ dQa
dQa
dQa
uCi
-ecj
+sYp
wUy
-hFy
+rWF
eMm
-hFy
+rWF
sfL
-ecj
+sYp
ezS
shB
-ick
+qOa
qer
-gei
-ktp
+bum
+xdL
fcX
-gei
+paT
umV
ecj
ecj
@@ -60192,15 +60357,15 @@ pkR
dqm
dQa
oAn
-ecj
+sYp
tNK
dKB
hrQ
dKB
dKB
-ecj
-ecj
-ecj
+sYp
+sYp
+sYp
cIL
qer
hHp
@@ -60449,7 +60614,7 @@ xZd
sPm
dQa
uCi
-ecj
+sYp
cFF
rsU
ohg
@@ -60458,7 +60623,7 @@ kGZ
fJl
mnD
cPO
-ick
+qOa
smn
wMm
iDY
@@ -61220,7 +61385,7 @@ qAk
ykW
qAk
cdt
-ecj
+sYp
hgA
tqS
nsK
@@ -61477,7 +61642,7 @@ ecD
ojO
ecD
oOi
-drp
+sYp
hqc
qVM
fbS
@@ -61485,7 +61650,7 @@ rrA
mlv
hyG
qYL
-ecj
+sYp
jgw
qer
gcP
@@ -61734,17 +61899,17 @@ kwr
oDG
xjS
hBm
-drp
+sYp
tCX
rrA
eGS
aAx
-ecj
-eNf
-exn
sYp
-vMi
+swr
+qbs
sYp
+vMi
+xGE
gcP
fpT
rev
@@ -61991,12 +62156,12 @@ pXP
oeL
wEF
wue
-drp
+sYp
uSU
kGZ
kGZ
kGZ
-exn
+qbs
aMy
uSu
sYp
@@ -62248,12 +62413,12 @@ tpD
fQx
sex
gDs
-drp
+sYp
bxf
-kGZ
+tAQ
kGQ
kGQ
-exn
+qbs
bMt
pJz
sYp
@@ -62505,7 +62670,7 @@ ujx
ujx
nNo
xnC
-fTt
+jPZ
swr
qbs
qbs
@@ -62515,7 +62680,7 @@ qbs
mnB
sYp
bXU
-sYp
+xGE
gcP
vlp
kqw
@@ -62762,7 +62927,7 @@ sMg
dyu
nNo
kQF
-fTt
+rBx
pRu
xTK
irn
@@ -63533,7 +63698,7 @@ nNo
nNo
nNo
fVj
-fTt
+rBx
jZO
qrB
bQO
@@ -63543,7 +63708,7 @@ rDZ
uOv
vuU
rRt
-sYp
+xGE
gcP
gcP
gcP
@@ -63790,7 +63955,7 @@ trx
trx
trx
vwW
-fTt
+rBx
bJC
uUz
uxc
@@ -63800,7 +63965,7 @@ rBx
rBx
vIy
rBx
-sYp
+xGE
oBg
wzY
nvE
@@ -64047,7 +64212,7 @@ nNo
nNo
nNo
oac
-fTt
+rBx
aDf
bHM
vTQ
@@ -64057,7 +64222,7 @@ rBx
vwl
lPT
vNg
-sYp
+xGE
xlt
xBP
glR
@@ -64304,7 +64469,7 @@ kDi
gee
win
vQp
-fTt
+rBx
ilG
iRZ
brO
@@ -64314,7 +64479,7 @@ rBx
kvN
wae
wgF
-sYp
+xGE
fDb
jBz
xKq
@@ -64561,7 +64726,7 @@ fTt
fTt
fTt
fTt
-fTt
+rBx
rBx
rBx
rBx
@@ -64571,7 +64736,7 @@ rBx
rBx
mfZ
rBx
-sYp
+xGE
xlt
riX
lXd
@@ -79263,7 +79428,7 @@ lSe
buM
sNY
jyF
-fli
+kSD
fli
mWV
cTt
@@ -79778,7 +79943,7 @@ tbY
sNY
jyF
fli
-fli
+cTS
jyF
cTt
qPy
@@ -80034,8 +80199,8 @@ beu
acH
sNY
jyF
-fli
-fli
+oDH
+jyF
jyF
cTt
qPy
@@ -80292,7 +80457,7 @@ tFc
sNY
jyF
fli
-wwI
+eEy
jyF
cTt
qPy
@@ -81833,8 +81998,8 @@ haa
fpw
iKn
jyF
-fli
-fli
+vKl
+vKl
jyF
cTt
qPy
@@ -82090,7 +82255,7 @@ wMk
fpw
iMs
jyF
-fli
+rPJ
wwI
jyF
cTt
@@ -82347,7 +82512,7 @@ mxZ
fpw
iKn
jyF
-fli
+xUD
fli
mWV
cTt
@@ -82604,7 +82769,7 @@ iMs
fpw
jlI
jyF
-fli
+joK
fli
mWV
cTt
@@ -82861,7 +83026,7 @@ iKn
fpw
iKn
jyF
-fli
+ubp
fli
mWV
cTt
@@ -83118,7 +83283,7 @@ iMs
fpw
iMs
jyF
-fli
+wBd
fli
jyF
cTt
diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm
index 28830c9cdc4..1153e2520a7 100644
--- a/_maps/map_files/Hammerhead/Hammerhead.dmm
+++ b/_maps/map_files/Hammerhead/Hammerhead.dmm
@@ -30850,7 +30850,7 @@
/turf/open/floor/plating,
/area/maintenance/department/science/xenobiology)
"iyP" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"iyY" = (
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining10.dmm b/_maps/map_files/Mining/nsv13/ruins/mining10.dmm
index e6812196729..884db8842bb 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining10.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining10.dmm
@@ -14,6 +14,9 @@
/obj/structure/table/wood,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/powered)
+"f" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"g" = (
/turf/closed/mineral,
/area/ruin/powered)
@@ -174,17 +177,17 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
a
a
a
a
-g
-g
-g
+f
+f
+f
a
a
a
@@ -214,21 +217,21 @@ a
a
a
a
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
+f
+f
a
a
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
+f
a
a
a
@@ -255,24 +258,24 @@ a
a
a
a
+f
+f
+f
+f
+f
g
g
+f
+f
+f
+f
+f
g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
a
a
a
@@ -297,6 +300,7 @@ a
a
a
a
+f
g
g
g
@@ -304,18 +308,17 @@ g
g
g
g
+f
+f
+f
g
g
+f
+f
g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -339,7 +342,7 @@ a
a
a
a
-g
+f
F
F
g
@@ -357,8 +360,8 @@ F
g
g
g
-g
-g
+f
+f
a
a
a
@@ -380,8 +383,8 @@ a
a
a
a
-g
-g
+f
+f
F
F
F
@@ -399,9 +402,9 @@ F
g
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -421,8 +424,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
F
@@ -442,8 +445,8 @@ F
F
g
g
-g
-g
+f
+f
a
a
a
@@ -461,9 +464,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
F
F
@@ -484,9 +487,9 @@ F
F
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -501,11 +504,11 @@ a
a
a
a
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
g
F
g
@@ -527,8 +530,8 @@ F
g
g
g
-g
-g
+f
+f
a
a
a
@@ -542,10 +545,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
g
g
g
@@ -569,8 +572,8 @@ F
g
g
g
-g
-g
+f
+f
a
a
a
@@ -584,8 +587,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
g
@@ -611,9 +614,9 @@ F
g
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -626,10 +629,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
g
g
g
@@ -654,8 +657,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -669,9 +672,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
F
@@ -696,8 +699,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -712,8 +715,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
F
@@ -737,9 +740,9 @@ F
g
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -753,9 +756,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
F
@@ -779,8 +782,8 @@ F
F
F
g
-g
-g
+f
+f
a
a
a
@@ -795,7 +798,7 @@ a
a
a
a
-g
+f
g
g
g
@@ -821,9 +824,9 @@ F
g
F
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -836,8 +839,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
g
@@ -864,8 +867,8 @@ g
F
g
g
-g
-g
+f
+f
a
a
a
@@ -878,8 +881,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
g
@@ -906,9 +909,9 @@ g
F
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -919,9 +922,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -949,8 +952,8 @@ F
g
g
g
-g
-g
+f
+f
a
a
a
@@ -961,9 +964,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -991,8 +994,8 @@ F
g
g
g
-g
-g
+f
+f
a
a
a
@@ -1003,10 +1006,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
g
g
g
@@ -1032,9 +1035,9 @@ F
F
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -1046,10 +1049,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
g
g
g
@@ -1074,8 +1077,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -1089,9 +1092,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -1116,8 +1119,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -1132,7 +1135,7 @@ a
a
a
a
-g
+f
g
g
g
@@ -1158,9 +1161,9 @@ g
g
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -1174,9 +1177,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -1201,8 +1204,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -1216,9 +1219,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -1243,8 +1246,8 @@ F
F
g
g
-g
-g
+f
+f
a
a
a
@@ -1259,8 +1262,8 @@ a
a
a
a
-g
-g
+f
+f
g
g
g
@@ -1284,9 +1287,9 @@ F
F
F
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -1301,9 +1304,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -1325,9 +1328,9 @@ g
F
F
F
-g
-g
-g
+f
+f
+f
a
a
a
@@ -1343,10 +1346,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
g
g
g
@@ -1365,9 +1368,9 @@ g
g
g
g
-g
-g
-g
+f
+f
+f
a
a
a
@@ -1386,9 +1389,9 @@ a
a
a
a
-g
-g
-g
+f
+f
+f
g
g
g
@@ -1407,8 +1410,8 @@ g
g
g
g
-g
-g
+f
+f
a
a
a
@@ -1429,28 +1432,28 @@ a
a
a
a
+f
+f
g
g
+f
+f
+f
+f
+f
+f
+f
+f
+f
g
g
g
g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
a
a
a
@@ -1471,27 +1474,27 @@ a
a
a
a
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
+f
g
g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
a
a
a
@@ -1513,25 +1516,25 @@ a
a
a
a
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
a
a
-g
-g
-g
-g
+f
+f
+f
+f
a
-g
-g
-g
-g
-g
-g
-g
+f
+f
+f
+f
+f
+f
+f
a
a
a
@@ -1556,8 +1559,8 @@ a
a
a
a
-g
-g
+f
+f
a
a
a
@@ -1568,10 +1571,10 @@ a
a
a
a
-g
-g
-g
-g
+f
+f
+f
+f
a
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining11.dmm b/_maps/map_files/Mining/nsv13/ruins/mining11.dmm
index 490813fb86b..b5d8cac72eb 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining11.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining11.dmm
@@ -155,6 +155,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"U" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
a
@@ -567,7 +570,7 @@ g
h
d
c
-c
+U
c
a
a
@@ -608,9 +611,9 @@ g
g
D
d
-c
-c
-c
+U
+U
+U
c
a
a
@@ -629,9 +632,9 @@ a
a
c
c
-c
-c
-c
+U
+U
+U
c
d
h
@@ -650,9 +653,9 @@ h
g
g
d
-c
-c
-c
+U
+U
+U
c
c
a
@@ -670,10 +673,10 @@ a
a
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
d
h
@@ -692,9 +695,9 @@ g
g
h
d
-c
-c
-c
+U
+U
+U
c
d
E
@@ -712,10 +715,10 @@ a
a
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
d
d
@@ -734,10 +737,10 @@ g
h
g
d
-c
-c
-c
-c
+U
+U
+U
+U
c
c
a
@@ -754,10 +757,10 @@ a
b
d
c
-c
-c
-c
-c
+U
+U
+U
+U
c
d
i
@@ -776,11 +779,11 @@ g
g
g
d
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
a
a
@@ -796,10 +799,10 @@ a
a
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
d
j
@@ -818,11 +821,11 @@ h
g
h
d
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
a
@@ -838,9 +841,9 @@ a
a
c
c
-c
-c
-c
+U
+U
+U
c
c
d
@@ -861,11 +864,11 @@ g
g
d
c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
a
@@ -881,9 +884,9 @@ a
c
c
c
-c
-c
-c
+U
+U
+U
c
d
d
@@ -903,11 +906,11 @@ h
g
d
c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
a
@@ -924,8 +927,8 @@ a
c
c
c
-c
-c
+U
+U
c
c
c
@@ -945,10 +948,10 @@ g
g
d
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -966,8 +969,8 @@ a
c
c
c
-c
-c
+U
+U
c
c
c
@@ -987,10 +990,10 @@ g
h
d
c
-c
-c
-c
-c
+U
+U
+U
+U
c
d
E
@@ -1008,10 +1011,10 @@ a
a
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1029,10 +1032,10 @@ g
h
d
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1050,10 +1053,10 @@ a
b
d
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1070,12 +1073,12 @@ g
h
g
d
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
c
c
a
@@ -1092,10 +1095,10 @@ a
a
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1113,11 +1116,11 @@ g
g
d
c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
a
@@ -1134,10 +1137,10 @@ a
c
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1155,11 +1158,11 @@ h
g
d
c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
a
@@ -1177,10 +1180,10 @@ c
c
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1196,12 +1199,12 @@ g
g
D
d
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
c
d
E
@@ -1219,10 +1222,10 @@ c
c
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1238,11 +1241,11 @@ h
g
h
d
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
c
@@ -1261,10 +1264,10 @@ c
c
c
c
-c
-c
-c
-c
+U
+U
+U
+U
c
c
c
@@ -1281,9 +1284,9 @@ g
h
d
c
-c
-c
-c
+U
+U
+U
c
c
c
@@ -1303,11 +1306,11 @@ c
c
c
c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
c
c
c
@@ -1323,9 +1326,9 @@ g
g
d
c
-c
-c
-c
+U
+U
+U
c
c
c
@@ -1345,12 +1348,12 @@ c
c
c
c
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
c
c
c
@@ -1365,8 +1368,8 @@ g
g
d
c
-c
-c
+U
+U
c
c
c
@@ -1388,15 +1391,15 @@ c
c
c
c
+U
+U
+U
+U
+U
+U
+U
c
-c
-c
-c
-c
-c
-c
-c
-c
+U
c
c
c
@@ -1406,9 +1409,9 @@ z
n
h
d
-c
-c
-c
+U
+U
+U
c
d
E
@@ -1430,26 +1433,26 @@ c
c
c
c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
c
d
d
d
d
d
-c
-c
+U
+U
c
c
c
@@ -1472,26 +1475,26 @@ c
c
c
c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
c
c
a
@@ -1515,23 +1518,23 @@ c
c
c
c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
c
c
a
@@ -1562,7 +1565,7 @@ c
c
c
c
-c
+U
c
c
c
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining12.dmm b/_maps/map_files/Mining/nsv13/ruins/mining12.dmm
index f5b540f24d0..f344171dce1 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining12.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining12.dmm
@@ -68,10 +68,7 @@
/turf/open/floor/plating/airless,
/area/ruin/powered)
"o" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/turf/open/floor/plating/airless,
+/turf/closed/mineral/random,
/area/ruin/powered)
"p" = (
/obj/machinery/light/small{
@@ -121,6 +118,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"X" = (
+/turf/closed/mineral/random,
+/area/template_noop)
(1,1,1) = {"
a
@@ -179,8 +179,8 @@ a
a
a
a
-b
-b
+o
+o
a
a
a
@@ -211,7 +211,7 @@ a
a
a
a
-b
+o
a
a
a
@@ -221,9 +221,9 @@ a
a
a
a
-b
-b
-b
+o
+o
+o
a
a
a
@@ -252,9 +252,9 @@ a
a
a
a
-b
-b
-b
+o
+o
+o
a
a
a
@@ -262,11 +262,11 @@ a
a
a
a
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
a
a
a
@@ -293,22 +293,22 @@ a
(5,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
@@ -334,23 +334,23 @@ a
"}
(6,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
@@ -376,23 +376,23 @@ a
"}
(7,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
@@ -419,21 +419,21 @@ a
(8,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
-b
-b
-b
-b
+o
+o
+o
+o
a
a
a
@@ -462,19 +462,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
a
a
-b
-b
+o
+o
a
a
a
@@ -505,10 +505,10 @@ a
a
a
a
-b
-b
-b
-b
+o
+o
+o
+o
a
a
a
@@ -548,8 +548,8 @@ a
a
a
a
-b
-b
+o
+o
a
a
a
@@ -1113,7 +1113,7 @@ b
c
e
e
-o
+e
e
c
b
@@ -1262,7 +1262,7 @@ a
a
a
a
-b
+o
a
a
a
@@ -1303,11 +1303,11 @@ a
a
a
a
-b
-b
-b
+o
+o
+o
a
-b
+o
a
a
a
@@ -1344,13 +1344,13 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1385,15 +1385,15 @@ a
(31,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1418,25 +1418,25 @@ a
a
a
a
-b
-b
+o
+o
a
a
a
"}
(32,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1459,26 +1459,26 @@ a
a
a
a
-b
-b
-b
-b
+o
+o
+o
+o
a
a
"}
(33,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1500,27 +1500,27 @@ a
a
a
a
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
a
a
"}
(34,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1541,27 +1541,27 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
a
"}
(35,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1577,31 +1577,31 @@ k
k
k
k
+X
a
a
a
a
a
-a
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
a
"}
(36,1,1) = {"
a
a
a
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
a
a
a
@@ -1626,11 +1626,11 @@ a
a
a
a
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
a
a
"}
@@ -1639,10 +1639,10 @@ a
a
a
a
-b
-b
-b
-b
+o
+o
+o
+o
a
a
a
@@ -1669,8 +1669,8 @@ a
a
a
a
-b
-b
+o
+o
a
a
a
@@ -1682,8 +1682,8 @@ a
a
a
a
-b
-b
+o
+o
a
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining13.dmm b/_maps/map_files/Mining/nsv13/ruins/mining13.dmm
index 572b07e1d33..6fcfdd1daa8 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining13.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining13.dmm
@@ -18,6 +18,21 @@
/obj/item/stack/tile/brass,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/powered)
+"g" = (
+/obj/item/toy/cog,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/powered)
+"o" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
+"B" = (
+/obj/effect/mob_spawn/human/corpse/charredskeleton,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/powered)
+"D" = (
+/obj/item/toy/cog,
+/turf/closed/mineral,
+/area/ruin/powered)
"I" = (
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
@@ -256,7 +271,7 @@ b
b
b
a
-b
+D
b
b
b
@@ -288,6 +303,10 @@ b
b
b
b
+o
+o
+o
+o
b
b
b
@@ -295,14 +314,10 @@ b
b
b
b
+o
b
-b
-b
-b
-b
-b
-b
-b
+o
+o
b
b
b
@@ -329,27 +344,27 @@ b
b
b
b
+o
+o
+o
+o
b
b
b
b
b
+o
+o
b
+o
b
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
b
a
a
@@ -370,29 +385,29 @@ a
b
b
b
+o
+o
+o
b
+o
b
+o
b
b
+o
b
+o
+o
b
+o
b
+o
+o
+o
+o
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
a
a
a
@@ -412,29 +427,29 @@ a
b
b
b
+o
+o
b
b
+o
b
b
+o
b
b
+o
+o
b
+o
+o
+o
+o
+o
+o
+o
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
a
a
@@ -454,28 +469,28 @@ b
b
b
b
+o
+o
b
b
+o
+o
+o
b
+o
b
+o
+o
b
+o
+o
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -495,28 +510,28 @@ a
b
b
b
+o
+o
+o
b
b
+o
+o
+o
+o
+o
+o
+o
b
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
b
b
b
@@ -537,27 +552,27 @@ a
b
b
b
+o
+o
+o
b
+o
+o
+o
+o
+o
b
+o
+o
b
+o
+o
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
b
b
b
@@ -579,26 +594,26 @@ a
b
b
b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
b
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -622,23 +637,23 @@ b
b
b
b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
b
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -664,21 +679,21 @@ a
b
b
b
+o
+o
+o
+o
+o
b
+o
b
+o
+o
b
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -706,14 +721,14 @@ a
b
b
b
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
+o
+o
b
b
b
@@ -748,30 +763,30 @@ a
b
b
b
+o
b
+o
+o
+o
+o
+o
b
+o
b
b
b
+o
b
b
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-c
c
c
c
c
+B
b
b
b
@@ -789,20 +804,20 @@ a
a
a
b
+o
+o
+o
b
+o
+o
+o
b
+o
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -832,18 +847,18 @@ a
a
b
b
+o
b
+o
+o
b
+o
b
+o
b
b
b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -873,18 +888,18 @@ a
a
a
b
+o
+o
+o
+o
+o
b
+o
+o
b
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -915,25 +930,24 @@ a
a
b
b
+o
+o
+o
b
+o
+o
+o
b
+o
b
+o
b
b
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-c
-c
+B
c
c
c
@@ -941,6 +955,7 @@ c
c
c
c
+g
b
b
b
@@ -957,13 +972,13 @@ a
a
b
b
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -999,14 +1014,14 @@ a
a
b
b
+o
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -1043,11 +1058,11 @@ b
b
b
b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
b
b
b
@@ -1083,12 +1098,12 @@ a
a
b
b
+o
+o
+o
b
-b
-b
-b
-b
-b
+o
+o
b
b
b
@@ -1107,7 +1122,7 @@ c
c
c
c
-c
+B
b
b
b
@@ -1128,11 +1143,11 @@ b
b
b
b
+o
b
-b
-b
-b
-b
+o
+o
+o
b
b
b
@@ -1167,15 +1182,15 @@ a
a
a
b
+o
b
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
+o
+o
b
b
b
@@ -1210,14 +1225,14 @@ a
b
b
b
+o
+o
+o
+o
+o
b
b
-b
-b
-b
-b
-b
-b
+o
b
b
b
@@ -1254,27 +1269,27 @@ b
b
b
b
+o
+o
+o
+o
b
+o
+o
b
b
b
b
b
+o
b
b
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
b
b
a
@@ -1293,30 +1308,30 @@ a
a
b
b
+o
+o
b
+o
b
+o
+o
b
+o
+o
+o
+o
b
+o
b
b
+o
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
a
@@ -1336,28 +1351,28 @@ a
b
b
b
+o
+o
+o
b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
b
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
b
b
a
@@ -1379,28 +1394,28 @@ b
b
b
b
+o
+o
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
b
a
a
@@ -1423,25 +1438,25 @@ b
b
b
b
+o
+o
+o
b
+o
b
+o
+o
+o
+o
+o
+o
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
b
a
a
@@ -1466,23 +1481,23 @@ b
b
b
b
+o
+o
+o
+o
b
+o
+o
+o
+o
+o
+o
+o
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
b
b
a
@@ -1509,11 +1524,11 @@ b
b
b
b
+o
b
-b
-b
-b
-b
+o
+o
+o
b
b
b
@@ -1550,18 +1565,18 @@ a
b
b
b
+o
b
+o
+o
+o
b
b
b
b
b
b
-b
-b
-b
-b
-b
+o
b
a
b
@@ -1593,16 +1608,16 @@ a
b
b
b
+o
+o
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+o
+o
+o
+o
+o
+o
+o
b
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining14.dmm b/_maps/map_files/Mining/nsv13/ruins/mining14.dmm
index 2dc466191fe..a0bfa7697eb 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining14.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining14.dmm
@@ -156,6 +156,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"R" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
a
@@ -429,10 +432,10 @@ b
b
b
b
-b
-b
-b
-b
+R
+R
+R
+R
b
e
e
@@ -470,11 +473,11 @@ b
b
b
b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
c
@@ -512,11 +515,11 @@ b
b
b
b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
c
@@ -554,11 +557,11 @@ b
b
b
b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
c
@@ -596,11 +599,11 @@ c
b
b
b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
b
@@ -640,9 +643,9 @@ c
c
b
b
-b
-b
-b
+R
+R
+R
b
b
b
@@ -682,9 +685,9 @@ c
b
b
b
-b
-b
-b
+R
+R
+R
b
b
b
@@ -724,10 +727,10 @@ b
b
b
b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
b
@@ -766,10 +769,10 @@ b
b
b
b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
b
@@ -794,6 +797,9 @@ a
a
a
b
+R
+R
+R
b
b
b
@@ -805,13 +811,10 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
b
@@ -837,6 +840,9 @@ a
a
b
b
+R
+R
+R
b
b
b
@@ -846,14 +852,11 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
b
@@ -877,25 +880,25 @@ a
a
a
b
+R
+R
b
b
+R
b
b
+R
+R
+R
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
b
@@ -920,24 +923,24 @@ a
a
b
b
+R
+R
+R
+R
+R
+R
+R
+R
b
+R
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
b
@@ -961,26 +964,26 @@ a
a
a
b
+R
b
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
b
b
c
@@ -991,8 +994,8 @@ s
x
b
b
-b
-b
+R
+R
b
b
a
@@ -1003,9 +1006,26 @@ a
a
a
b
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
b
b
+R
+R
+R
b
b
b
@@ -1016,26 +1036,9 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
b
a
"}
@@ -1045,13 +1048,26 @@ a
a
a
b
+R
+R
+R
b
+R
+R
b
+R
b
+R
+R
+R
+R
b
b
b
b
+R
+R
+R
b
b
b
@@ -1061,23 +1077,10 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
b
a
"}
@@ -1088,13 +1091,27 @@ a
a
b
b
+R
+R
b
b
b
b
b
+R
+R
+R
+R
+R
+R
+R
+R
b
b
+R
+R
+R
+R
b
b
b
@@ -1102,24 +1119,10 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
b
a
"}
@@ -1139,28 +1142,28 @@ b
b
b
b
+R
+R
+R
+R
+R
+R
b
b
+R
+R
+R
+R
b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
+R
b
b
a
@@ -1182,27 +1185,27 @@ b
b
b
b
+R
+R
+R
+R
+R
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
b
a
@@ -1225,26 +1228,26 @@ b
b
b
b
+R
+R
+R
+R
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
a
a
@@ -1266,25 +1269,25 @@ c
c
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
b
a
@@ -1309,23 +1312,23 @@ b
b
b
b
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
+R
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
b
b
b
@@ -1351,6 +1354,15 @@ b
b
b
b
+R
+R
+R
+R
+R
+R
+R
+R
+R
b
b
b
@@ -1358,16 +1370,7 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+R
b
b
a
@@ -1393,12 +1396,12 @@ c
b
b
b
-b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
+R
b
b
b
@@ -1435,11 +1438,11 @@ b
b
b
b
-b
-b
-b
-b
-b
+R
+R
+R
+R
+R
b
b
b
@@ -1478,9 +1481,9 @@ b
b
b
b
-b
-b
-b
+R
+R
+R
b
b
b
@@ -1520,8 +1523,8 @@ b
b
b
b
-b
-b
+R
+R
b
b
b
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining15.dmm b/_maps/map_files/Mining/nsv13/ruins/mining15.dmm
index 5ae01e5288b..fd2b08fd060 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining15.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining15.dmm
@@ -5,6 +5,9 @@
"b" = (
/turf/closed/mineral,
/area/ruin/powered)
+"e" = (
+/turf/closed/mineral/random/high_chance,
+/area/ruin/powered)
"n" = (
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
@@ -97,37 +100,37 @@ a
(3,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
a
a
a
@@ -139,37 +142,37 @@ a
(4,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
a
a
a
@@ -180,7 +183,7 @@ a
"}
(5,1,1) = {"
a
-a
+b
b
b
b
@@ -222,7 +225,6 @@ a
"}
(6,1,1) = {"
a
-a
b
b
b
@@ -251,6 +253,7 @@ b
b
b
b
+e
b
b
b
@@ -264,14 +267,11 @@ a
"}
(7,1,1) = {"
a
-a
-b
-b
-b
-b
-b
b
b
+e
+e
+e
b
b
b
@@ -294,6 +294,9 @@ b
b
b
b
+e
+e
+e
b
b
a
@@ -306,15 +309,12 @@ a
"}
(8,1,1) = {"
a
-a
-b
-b
-b
-b
-b
-b
b
b
+e
+e
+e
+e
b
b
b
@@ -336,6 +336,9 @@ b
b
b
b
+e
+e
+e
b
b
a
@@ -348,15 +351,12 @@ a
"}
(9,1,1) = {"
a
-a
-b
-b
-b
-b
-b
-b
b
b
+e
+e
+e
+e
b
b
b
@@ -378,6 +378,9 @@ b
b
b
b
+e
+e
+e
b
b
a
@@ -390,12 +393,12 @@ a
"}
(10,1,1) = {"
a
-a
-b
-b
b
b
b
+e
+e
+e
b
b
b
@@ -432,11 +435,11 @@ a
"}
(11,1,1) = {"
a
-a
b
b
b
b
+e
b
b
b
@@ -474,7 +477,7 @@ a
"}
(12,1,1) = {"
a
-a
+b
b
b
b
@@ -516,7 +519,7 @@ a
"}
(13,1,1) = {"
a
-a
+b
b
b
b
@@ -558,7 +561,7 @@ a
"}
(14,1,1) = {"
a
-a
+b
b
b
b
@@ -600,7 +603,7 @@ a
"}
(15,1,1) = {"
a
-a
+b
b
b
b
@@ -642,7 +645,7 @@ a
"}
(16,1,1) = {"
a
-a
+b
b
b
b
@@ -684,7 +687,7 @@ a
"}
(17,1,1) = {"
a
-a
+b
b
b
b
@@ -726,7 +729,7 @@ a
"}
(18,1,1) = {"
a
-a
+b
b
b
b
@@ -768,7 +771,7 @@ a
"}
(19,1,1) = {"
a
-a
+b
b
b
b
@@ -810,7 +813,7 @@ a
"}
(20,1,1) = {"
a
-a
+b
b
b
b
@@ -852,7 +855,7 @@ a
"}
(21,1,1) = {"
a
-a
+b
b
b
b
@@ -894,7 +897,7 @@ a
"}
(22,1,1) = {"
a
-a
+b
b
b
b
@@ -936,7 +939,7 @@ a
"}
(23,1,1) = {"
a
-a
+b
b
b
b
@@ -978,7 +981,7 @@ a
"}
(24,1,1) = {"
a
-a
+b
b
b
b
@@ -1020,7 +1023,7 @@ a
"}
(25,1,1) = {"
a
-a
+b
b
b
b
@@ -1062,7 +1065,7 @@ a
"}
(26,1,1) = {"
a
-a
+b
b
b
b
@@ -1104,7 +1107,7 @@ a
"}
(27,1,1) = {"
a
-a
+b
b
b
b
@@ -1146,7 +1149,7 @@ a
"}
(28,1,1) = {"
a
-a
+b
b
b
b
@@ -1188,7 +1191,7 @@ a
"}
(29,1,1) = {"
a
-a
+b
b
b
b
@@ -1230,7 +1233,7 @@ a
"}
(30,1,1) = {"
a
-a
+b
b
b
b
@@ -1272,7 +1275,6 @@ a
"}
(31,1,1) = {"
a
-a
b
b
b
@@ -1301,6 +1303,7 @@ b
b
b
b
+e
b
b
b
@@ -1314,13 +1317,10 @@ a
"}
(32,1,1) = {"
a
-a
-b
-b
-b
b
b
b
+e
b
b
b
@@ -1344,6 +1344,9 @@ b
b
b
b
+e
+e
+e
b
b
a
@@ -1356,14 +1359,11 @@ a
"}
(33,1,1) = {"
a
-a
-b
-b
-b
-b
-b
b
b
+e
+e
+e
b
b
b
@@ -1386,6 +1386,9 @@ b
b
b
b
+e
+e
+e
b
b
a
@@ -1398,13 +1401,11 @@ a
"}
(34,1,1) = {"
a
-a
-b
-b
-b
-b
b
b
+e
+e
+e
b
b
b
@@ -1428,6 +1429,8 @@ b
b
b
b
+e
+e
b
b
a
@@ -1440,7 +1443,7 @@ a
"}
(35,1,1) = {"
a
-a
+b
b
b
b
@@ -1482,7 +1485,7 @@ a
"}
(36,1,1) = {"
a
-a
+b
b
b
b
@@ -1525,37 +1528,37 @@ a
(37,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
a
a
a
@@ -1567,37 +1570,37 @@ a
(38,1,1) = {"
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
a
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining16.dmm b/_maps/map_files/Mining/nsv13/ruins/mining16.dmm
index 10881d3e9aa..b73e289c3ce 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining16.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining16.dmm
@@ -157,6 +157,9 @@
},
/turf/open/floor/plating/asteroid,
/area/ruin/powered)
+"U" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
a
@@ -1175,8 +1178,8 @@ a
i
i
i
-i
-i
+U
+U
i
i
i
@@ -1216,10 +1219,10 @@ a
a
i
i
-i
-i
-i
-i
+U
+U
+U
+U
i
i
i
@@ -1258,13 +1261,13 @@ a
a
i
i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
i
i
i
@@ -1302,16 +1305,16 @@ a
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
i
i
@@ -1345,6 +1348,17 @@ a
i
i
i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
i
i
@@ -1355,20 +1369,9 @@ i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
v
v
v
@@ -1389,31 +1392,31 @@ i
i
i
i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
a
a
@@ -1433,28 +1436,28 @@ i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
a
a
@@ -1479,23 +1482,23 @@ i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
a
a
@@ -1522,21 +1525,21 @@ i
a
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
i
i
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining17.dmm b/_maps/map_files/Mining/nsv13/ruins/mining17.dmm
index 50af1f87d93..7e2853ed280 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining17.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining17.dmm
@@ -2,6 +2,9 @@
"a" = (
/turf/template_noop,
/area/template_noop)
+"f" = (
+/turf/closed/mineral/random/low_chance,
+/area/ruin/powered)
"g" = (
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
@@ -9,11 +12,91 @@
"i" = (
/turf/closed/mineral,
/area/ruin/powered)
+"l" = (
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"p" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
+"r" = (
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
"s" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "plasma=10000;TEMP=293.15"
},
/area/ruin/powered)
+"x" = (
+/obj/item/stack/sheet/bone,
+/turf/closed/mineral,
+/area/ruin/powered)
+"y" = (
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"A" = (
+/obj/item/organ/tongue/bone,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"H" = (
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"M" = (
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"O" = (
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/obj/item/stack/sheet/sinew,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"T" = (
+/turf/closed/mineral/random/high_chance,
+/area/ruin/powered)
+"V" = (
+/obj/item/stack/sheet/bone,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
+"W" = (
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/obj/item/stack/sheet/bone,
+/turf/open/floor/plating/asteroid{
+ initial_gas_mix = "plasma=10000;TEMP=293.15"
+ },
+/area/ruin/powered)
(1,1,1) = {"
a
@@ -207,7 +290,7 @@ i
i
i
i
-i
+f
i
i
i
@@ -246,12 +329,12 @@ i
i
i
i
+f
i
i
+f
i
i
-s
-i
i
i
i
@@ -291,12 +374,12 @@ i
i
i
i
-s
-s
-s
i
i
i
+r
+s
+i
a
a
a
@@ -333,10 +416,10 @@ i
i
i
i
-s
-i
i
i
+M
+r
i
i
a
@@ -366,18 +449,18 @@ i
i
i
i
-s
-i
-s
-i
-i
-i
i
i
+W
+r
i
i
i
i
+V
+r
+V
+W
i
i
i
@@ -403,15 +486,6 @@ a
a
i
i
-s
-s
-s
-s
-s
-s
-s
-s
-s
i
i
i
@@ -420,6 +494,15 @@ i
i
i
i
+s
+i
+i
+y
+r
+W
+i
+i
+i
i
i
i
@@ -448,14 +531,12 @@ i
i
i
i
-s
i
i
i
-s
-i
i
i
+s
i
i
i
@@ -465,6 +546,8 @@ i
i
i
i
+V
+s
i
i
i
@@ -488,19 +571,15 @@ i
i
i
i
-s
-s
-s
-s
i
i
-s
-s
i
i
i
i
i
+r
+W
i
i
i
@@ -508,8 +587,12 @@ i
i
i
i
+W
+O
i
i
+p
+i
a
a
a
@@ -533,24 +616,24 @@ i
i
i
i
+H
+r
+s
i
i
+r
i
i
i
i
i
+V
+r
+M
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+x
+p
i
a
a
@@ -569,25 +652,25 @@ a
a
i
i
-s
-s
-i
-i
-i
-i
-i
-i
-i
+p
+p
i
i
+r
+r
+V
i
i
i
i
+W
i
i
i
+W
+r
i
+p
i
i
i
@@ -611,16 +694,10 @@ a
a
i
i
-s
-s
-i
-i
-i
-i
-i
-i
i
+p
i
+V
i
i
i
@@ -628,12 +705,18 @@ i
i
i
i
+s
+s
i
+r
i
i
+p
+p
i
i
i
+s
i
i
i
@@ -654,9 +737,6 @@ a
i
i
i
-s
-i
-i
i
i
i
@@ -668,6 +748,7 @@ i
i
i
i
+W
i
i
i
@@ -675,6 +756,8 @@ i
i
i
i
+r
+s
i
i
i
@@ -707,21 +790,21 @@ i
i
i
i
+W
i
i
+s
+l
+V
+V
+r
+y
i
i
i
i
i
i
-i
-s
-s
-i
-i
-i
-i
a
a
a
@@ -749,6 +832,10 @@ i
i
i
i
+r
+r
+V
+s
i
i
i
@@ -758,10 +845,6 @@ i
i
i
i
-s
-s
-i
-i
i
i
a
@@ -785,23 +868,23 @@ i
i
i
i
+s
+r
+r
+s
+s
+V
+s
+r
i
i
i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-s
+r
+M
+r
i
i
i
@@ -825,23 +908,23 @@ i
i
i
i
+M
+r
+r
+r
+y
+O
i
i
i
+r
i
i
i
i
-i
-i
-i
-i
-i
-i
-i
-i
-i
-i
+r
+V
+V
i
i
i
@@ -865,6 +948,9 @@ a
i
i
i
+s
+V
+s
i
i
i
@@ -873,20 +959,17 @@ i
i
i
i
+s
i
i
i
+r
i
i
i
i
i
-i
-i
-i
-i
-i
-i
+r
i
i
i
@@ -919,6 +1002,7 @@ i
i
i
i
+r
i
i
i
@@ -927,8 +1011,7 @@ i
i
i
i
-i
-i
+r
i
i
a
@@ -946,9 +1029,6 @@ a
a
a
i
-s
-s
-i
i
i
i
@@ -964,12 +1044,15 @@ i
i
i
i
+r
i
i
+f
i
i
i
i
+V
i
i
a
@@ -989,10 +1072,6 @@ a
a
i
i
-s
-i
-i
-i
i
i
i
@@ -1004,7 +1083,10 @@ i
i
i
i
+s
+V
i
+s
i
i
i
@@ -1012,6 +1094,7 @@ i
i
i
i
+O
i
i
a
@@ -1031,13 +1114,6 @@ a
a
i
i
-s
-i
-i
-i
-i
-i
-i
i
i
i
@@ -1046,14 +1122,21 @@ i
i
i
i
+M
+V
+r
+s
i
i
i
+s
i
i
i
+f
i
i
+r
i
i
a
@@ -1073,16 +1156,14 @@ a
a
i
i
-s
-s
-i
-i
-i
i
i
i
i
i
+r
+V
+O
i
i
i
@@ -1090,12 +1171,14 @@ i
i
i
i
+r
i
i
i
i
i
i
+V
i
a
a
@@ -1116,8 +1199,6 @@ a
i
i
i
-s
-i
i
i
i
@@ -1132,10 +1213,12 @@ i
i
i
i
+r
i
i
i
i
+f
i
i
i
@@ -1172,12 +1255,12 @@ i
i
i
i
+W
i
i
i
i
-i
-i
+f
i
i
i
@@ -1211,11 +1294,11 @@ i
i
i
i
+r
+r
i
i
-i
-i
-i
+r
i
i
i
@@ -1245,19 +1328,19 @@ i
i
i
i
+T
+T
i
i
i
i
+V
+y
i
i
i
i
-i
-i
-s
-i
-i
+W
i
i
i
@@ -1288,6 +1371,8 @@ i
i
i
i
+T
+T
i
i
i
@@ -1296,10 +1381,8 @@ i
i
i
i
-s
-s
-s
i
+s
i
i
i
@@ -1326,22 +1409,22 @@ a
a
a
i
-s
-s
-s
i
i
i
i
i
i
-s
-s
-s
-s
-s
-s
-s
+i
+i
+i
+i
+i
+i
+i
+i
+i
+r
i
i
i
@@ -1369,9 +1452,6 @@ a
a
i
i
-s
-s
-s
i
i
i
@@ -1380,13 +1460,16 @@ i
i
i
i
-s
i
i
i
i
i
i
+r
+i
+i
+i
a
a
a
@@ -1425,7 +1508,7 @@ i
i
i
i
-i
+A
i
i
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining18.dmm b/_maps/map_files/Mining/nsv13/ruins/mining18.dmm
index f4fffe7fc0d..90b1d6a8140 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining18.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining18.dmm
@@ -191,6 +191,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"R" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
E
@@ -421,15 +424,15 @@ E
a
a
a
+R
+R
a
+R
+R
a
-a
-a
-a
-a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -460,19 +463,19 @@ E
E
a
a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
a
a
E
@@ -502,6 +505,9 @@ E
a
a
a
+R
+R
+R
a
a
a
@@ -509,13 +515,10 @@ a
a
a
a
-a
-a
-a
-a
-a
-a
-a
+R
+R
+R
+R
a
a
E
@@ -543,6 +546,9 @@ E
E
a
a
+R
+R
+R
a
a
a
@@ -552,14 +558,11 @@ a
a
a
a
-a
-a
-a
-a
-a
-a
-a
-a
+R
+R
+R
+R
+R
a
E
E
@@ -584,6 +587,9 @@ E
E
a
a
+R
+R
+R
a
a
a
@@ -597,11 +603,8 @@ a
a
a
a
-a
-a
-a
-a
-a
+R
+R
a
E
E
@@ -626,8 +629,8 @@ E
E
a
a
-a
-a
+R
+R
a
a
a
@@ -668,8 +671,8 @@ E
E
a
a
-a
-a
+R
+R
a
a
a
@@ -709,9 +712,9 @@ E
E
E
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -751,8 +754,8 @@ E
E
E
a
-a
-a
+R
+R
a
a
a
@@ -793,8 +796,8 @@ E
E
E
a
-a
-a
+R
+R
a
a
a
@@ -835,7 +838,7 @@ E
E
E
a
-a
+R
a
a
a
@@ -877,7 +880,7 @@ E
E
E
a
-a
+R
a
a
a
@@ -918,8 +921,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -960,8 +963,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -1002,8 +1005,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -1044,8 +1047,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -1086,8 +1089,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -1128,8 +1131,8 @@ E
E
E
E
-a
-a
+R
+R
a
a
a
@@ -1171,7 +1174,7 @@ E
E
E
a
-a
+R
a
a
a
@@ -1213,7 +1216,7 @@ E
E
E
a
-a
+R
a
a
a
@@ -1255,9 +1258,9 @@ E
E
E
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1298,8 +1301,8 @@ E
E
a
a
-a
-a
+R
+R
a
a
a
@@ -1340,9 +1343,9 @@ E
E
a
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1383,9 +1386,9 @@ E
E
a
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1426,9 +1429,9 @@ E
E
a
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1469,9 +1472,9 @@ E
E
a
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1511,10 +1514,10 @@ E
E
E
a
-a
-a
-a
-a
+R
+R
+R
+R
a
a
a
@@ -1555,9 +1558,9 @@ E
E
a
a
-a
-a
-a
+R
+R
+R
a
a
a
@@ -1598,7 +1601,7 @@ E
E
E
a
-a
+R
a
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining19.dmm b/_maps/map_files/Mining/nsv13/ruins/mining19.dmm
index d6e98c50103..2e44610d330 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining19.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining19.dmm
@@ -129,6 +129,9 @@
},
/turf/open/floor/wood,
/area/ruin/powered)
+"J" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"K" = (
/obj/structure/rack,
/obj/item/clothing/under/costume/geisha,
@@ -562,7 +565,7 @@ Y
Y
Y
b
-b
+J
b
b
b
@@ -604,7 +607,7 @@ Y
Y
Y
b
-b
+J
b
b
b
@@ -646,8 +649,8 @@ Y
Y
Y
b
-b
-b
+J
+J
b
b
b
@@ -688,8 +691,8 @@ Y
Y
Y
b
-b
-b
+J
+J
b
b
b
@@ -730,9 +733,9 @@ Y
Y
Y
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -773,8 +776,8 @@ Y
Y
b
b
-b
-b
+J
+J
b
b
b
@@ -815,9 +818,9 @@ Y
Y
b
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -858,8 +861,8 @@ Y
Y
b
b
-b
-b
+J
+J
b
b
b
@@ -900,8 +903,8 @@ Y
Y
Y
b
-b
-b
+J
+J
b
b
b
@@ -942,9 +945,9 @@ Y
Y
Y
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -984,9 +987,9 @@ Y
Y
Y
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -1027,9 +1030,9 @@ Y
Y
b
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -1069,9 +1072,9 @@ Y
Y
b
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -1111,10 +1114,10 @@ Y
Y
b
b
-b
-b
-b
-b
+J
+J
+J
+J
b
b
b
@@ -1154,10 +1157,10 @@ Y
Y
b
b
-b
-b
-b
-b
+J
+J
+J
+J
b
b
b
@@ -1197,10 +1200,10 @@ Y
b
b
b
-b
-b
-b
-b
+J
+J
+J
+J
b
b
b
@@ -1240,9 +1243,9 @@ Y
b
b
b
-b
-b
-b
+J
+J
+J
b
b
b
@@ -1282,10 +1285,10 @@ Y
b
b
b
-b
-b
-b
-b
+J
+J
+J
+J
b
b
b
@@ -1325,11 +1328,11 @@ Y
b
b
b
-b
-b
-b
-b
-b
+J
+J
+J
+J
+J
b
b
b
@@ -1369,6 +1372,11 @@ b
b
b
b
+J
+J
+J
+J
+J
b
b
b
@@ -1380,12 +1388,7 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
+J
b
Y
Y
@@ -1411,7 +1414,12 @@ Y
Y
Y
b
+J
+J
+J
b
+J
+J
b
b
b
@@ -1422,13 +1430,8 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
+J
+J
Y
Y
Y
@@ -1454,6 +1457,12 @@ Y
Y
Y
b
+J
+J
+J
+J
+J
+J
b
b
b
@@ -1461,15 +1470,9 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+J
+J
+J
b
Y
Y
@@ -1498,20 +1501,20 @@ Y
Y
b
b
+J
+J
+J
+J
+J
+J
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+J
+J
+J
+J
+J
b
Y
Y
@@ -1541,18 +1544,18 @@ Y
b
b
b
+J
+J
+J
+J
+J
b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+J
+J
+J
+J
+J
+J
b
b
Y
@@ -1585,14 +1588,14 @@ b
b
b
b
-b
-b
-b
-b
-b
-b
-b
-b
+J
+J
+J
+J
+J
+J
+J
+J
b
b
b
@@ -1629,10 +1632,10 @@ b
b
b
b
-b
-b
-b
-b
+J
+J
+J
+J
b
b
b
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining20.dmm b/_maps/map_files/Mining/nsv13/ruins/mining20.dmm
index 76fcbf2c8a1..3c134901dc3 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining20.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining20.dmm
@@ -110,6 +110,9 @@
/obj/structure/flora/ausbushes/grassybush,
/turf/open/floor/grass,
/area/ruin/powered)
+"C" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"D" = (
/obj/machinery/light{
dir = 4
@@ -590,8 +593,8 @@ a
a
w
w
-w
-w
+C
+C
w
w
a
@@ -629,13 +632,13 @@ F
F
w
w
+C
+C
+C
w
-w
-w
-w
-w
-w
-w
+C
+C
+C
w
F
a
@@ -670,15 +673,15 @@ F
w
w
w
+C
w
w
+C
+C
+C
w
-w
-w
-w
-w
-w
-w
+C
+C
w
a
F
@@ -709,6 +712,10 @@ F
a
w
w
+C
+C
+C
+C
w
w
w
@@ -717,11 +724,7 @@ w
w
w
w
-w
-w
-w
-w
-w
+C
w
a
a
@@ -750,6 +753,8 @@ a
a
w
w
+C
+C
w
w
w
@@ -761,9 +766,7 @@ w
w
w
w
-w
-w
-w
+C
w
w
a
@@ -791,6 +794,9 @@ a
F
a
w
+C
+C
+C
w
w
w
@@ -800,12 +806,9 @@ w
w
w
w
-w
-w
-w
-w
-w
-w
+C
+C
+C
w
w
a
@@ -833,6 +836,8 @@ F
F
w
w
+C
+C
w
w
w
@@ -846,10 +851,8 @@ w
w
w
w
-w
-w
-w
-w
+C
+C
w
a
a
@@ -874,6 +877,8 @@ a
a
w
w
+C
+C
w
w
w
@@ -889,9 +894,7 @@ w
w
w
w
-w
-w
-w
+C
w
F
F
@@ -915,6 +918,8 @@ e
a
F
w
+C
+C
w
w
w
@@ -931,10 +936,8 @@ w
w
w
w
-w
-w
-w
-w
+C
+C
w
F
F
@@ -957,6 +960,7 @@ e
a
w
w
+C
w
w
w
@@ -975,8 +979,7 @@ w
w
w
w
-w
-w
+C
w
w
F
@@ -998,6 +1001,8 @@ a
e
a
w
+C
+C
w
w
w
@@ -1016,10 +1021,8 @@ w
w
w
w
-w
-w
-w
-w
+C
+C
w
F
e
@@ -1039,6 +1042,8 @@ F
a
e
a
+C
+C
w
w
w
@@ -1059,9 +1064,7 @@ w
w
w
w
-w
-w
-w
+C
w
F
e
@@ -1081,6 +1084,8 @@ F
a
e
a
+C
+C
w
w
w
@@ -1101,9 +1106,7 @@ w
w
w
w
-w
-w
-w
+C
w
F
e
@@ -1123,6 +1126,8 @@ F
a
e
a
+C
+C
w
w
w
@@ -1143,9 +1148,7 @@ w
w
w
w
-w
-w
-w
+C
w
F
e
@@ -1167,6 +1170,7 @@ e
a
w
w
+C
w
w
w
@@ -1185,8 +1189,7 @@ w
w
w
w
-w
-w
+C
w
F
F
@@ -1209,6 +1212,7 @@ e
a
F
w
+C
w
w
w
@@ -1226,9 +1230,8 @@ w
w
w
w
-w
-w
-w
+C
+C
w
F
F
@@ -1251,6 +1254,7 @@ e
a
F
F
+C
w
w
w
@@ -1267,8 +1271,7 @@ w
w
w
w
-w
-w
+C
w
w
F
@@ -1293,6 +1296,7 @@ e
a
F
F
+C
w
w
w
@@ -1307,10 +1311,9 @@ w
w
w
w
-w
-w
-w
-w
+C
+C
+C
w
F
F
@@ -1336,6 +1339,11 @@ W
W
F
w
+C
+C
+C
+C
+C
w
w
w
@@ -1343,14 +1351,9 @@ w
w
w
w
-w
-w
-w
-w
-w
-w
-w
-w
+C
+C
+C
w
w
F
@@ -1382,15 +1385,15 @@ w
w
w
w
+C
+C
+C
w
w
w
w
-w
-w
-w
-w
-w
+C
+C
w
w
w
@@ -1426,12 +1429,12 @@ F
w
w
w
+C
+C
w
-w
-w
-w
-w
-w
+C
+C
+C
w
w
F
@@ -1470,8 +1473,8 @@ F
F
w
w
-w
-w
+C
+C
w
w
F
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining21.dmm b/_maps/map_files/Mining/nsv13/ruins/mining21.dmm
index 59d8a42ffda..605cacad45a 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining21.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining21.dmm
@@ -1,4 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"e" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"h" = (
/turf/template_noop,
/area/template_noop)
@@ -277,9 +280,9 @@ h
h
h
h
-o
-o
-o
+e
+e
+e
h
h
h
@@ -318,11 +321,11 @@ h
(7,1,1) = {"
h
h
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
h
h
h
@@ -360,12 +363,12 @@ h
(8,1,1) = {"
h
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
h
h
@@ -393,21 +396,21 @@ h
h
h
h
-o
-o
-o
+e
+e
+e
h
h
"}
(9,1,1) = {"
h
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
h
h
@@ -433,23 +436,23 @@ h
h
h
h
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
h
h
"}
(10,1,1) = {"
h
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
h
h
@@ -474,24 +477,24 @@ h
h
h
h
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
h
"}
(11,1,1) = {"
h
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
h
h
@@ -516,23 +519,23 @@ o
h
h
h
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
h
"}
(12,1,1) = {"
h
h
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
h
h
h
@@ -559,20 +562,20 @@ h
h
h
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
"}
(13,1,1) = {"
h
h
h
-o
-o
+e
+e
h
h
h
@@ -602,10 +605,10 @@ h
h
h
h
-o
-o
-o
-o
+e
+e
+e
+e
h
h
"}
@@ -645,7 +648,7 @@ h
h
h
h
-o
+e
h
h
h
@@ -1410,10 +1413,10 @@ h
(33,1,1) = {"
h
h
-o
-o
-o
-o
+e
+e
+e
+e
h
h
h
@@ -1451,12 +1454,12 @@ h
"}
(34,1,1) = {"
h
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
h
h
h
@@ -1492,14 +1495,14 @@ h
h
"}
(35,1,1) = {"
-o
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
+e
h
h
h
@@ -1534,15 +1537,15 @@ h
h
"}
(36,1,1) = {"
-o
-o
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
+e
+e
h
h
h
@@ -1576,15 +1579,15 @@ h
h
"}
(37,1,1) = {"
-o
-o
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
+e
+e
h
h
h
@@ -1618,14 +1621,14 @@ h
h
"}
(38,1,1) = {"
-o
-o
-o
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
+e
+e
+e
h
h
h
@@ -1661,11 +1664,11 @@ h
"}
(39,1,1) = {"
h
-o
-o
-o
-o
-o
+e
+e
+e
+e
+e
h
h
h
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining22.dmm b/_maps/map_files/Mining/nsv13/ruins/mining22.dmm
index ddd21302f63..6bd820e510a 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining22.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining22.dmm
@@ -224,6 +224,9 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating/airless,
/area/ruin/powered)
+"V" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"W" = (
/turf/template_noop,
/area/template_noop)
@@ -455,7 +458,7 @@ D
D
D
D
-D
+V
D
D
D
@@ -495,10 +498,10 @@ W
W
D
D
+V
+V
D
-D
-D
-D
+V
D
D
D
@@ -536,13 +539,13 @@ W
W
D
D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
D
D
D
@@ -559,15 +562,15 @@ W
W
D
D
+V
+V
D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
D
D
W
@@ -576,15 +579,15 @@ W
"}
(9,1,1) = {"
W
+V
D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
D
D
D
@@ -599,35 +602,35 @@ W
W
D
D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
D
D
W
W
"}
(10,1,1) = {"
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
D
D
D
@@ -641,35 +644,35 @@ D
D
D
D
+V
+V
D
+V
+V
+V
+V
+V
+V
D
D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
D
D
W
"}
(11,1,1) = {"
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
D
D
W
@@ -680,38 +683,38 @@ W
W
W
D
+V
+V
+V
+V
D
D
+V
+V
D
D
D
D
D
D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
D
D
W
"}
(12,1,1) = {"
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
D
D
W
@@ -721,6 +724,10 @@ W
D
D
D
+V
+V
+V
+V
D
D
D
@@ -733,26 +740,22 @@ D
D
D
D
-D
-D
-D
-D
-D
-D
+V
+V
D
D
"}
(13,1,1) = {"
-D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
+V
+V
D
D
W
@@ -762,6 +765,9 @@ W
W
D
D
+V
+V
+V
D
D
D
@@ -776,25 +782,22 @@ D
D
D
D
-D
-D
-D
-D
-D
+V
+V
D
D
"}
(14,1,1) = {"
+V
D
-D
-D
-D
-D
-D
-D
-D
-D
-D
+V
+V
+V
+V
+V
+V
+V
+V
D
W
W
@@ -803,6 +806,8 @@ W
W
D
D
+V
+V
D
D
D
@@ -819,15 +824,13 @@ D
D
D
D
-D
-D
-D
-D
-D
+V
+V
+V
D
"}
(15,1,1) = {"
-D
+V
D
D
D
@@ -844,6 +847,8 @@ W
W
W
D
+V
+V
D
D
D
@@ -862,14 +867,12 @@ D
D
D
D
-D
-D
-D
-D
-D
+V
+V
+V
"}
(16,1,1) = {"
-D
+V
D
D
D
@@ -904,14 +907,14 @@ D
D
D
D
-D
-D
-D
-D
+V
+V
+V
+V
D
"}
(17,1,1) = {"
-D
+V
D
D
D
@@ -946,9 +949,9 @@ D
D
D
D
-D
-D
-D
+V
+V
+V
D
D
"}
@@ -988,9 +991,9 @@ D
D
D
D
-D
-D
-D
+V
+V
+V
D
W
"}
@@ -1030,8 +1033,8 @@ D
D
D
D
-D
-D
+V
+V
D
D
W
@@ -1070,10 +1073,10 @@ D
D
D
D
-D
-D
-D
-D
+V
+V
+V
+V
D
W
W
@@ -1112,10 +1115,10 @@ D
D
D
D
-D
-D
-D
-D
+V
+V
+V
+V
D
W
W
@@ -1154,9 +1157,9 @@ F
D
D
D
-D
-D
-D
+V
+V
+V
D
D
W
@@ -1196,9 +1199,9 @@ r
D
D
D
-D
-D
-D
+V
+V
+V
D
D
W
@@ -1238,8 +1241,8 @@ r
D
D
D
-D
-D
+V
+V
D
D
W
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining23.dmm b/_maps/map_files/Mining/nsv13/ruins/mining23.dmm
index 44bc57bf603..88719f11768 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining23.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining23.dmm
@@ -5,6 +5,9 @@
"h" = (
/turf/closed/mineral,
/area/ruin/powered)
+"n" = (
+/turf/closed/mineral/random/high_chance,
+/area/ruin/powered)
"C" = (
/obj/effect/mine/sound/bwoink{
opacity = 255
@@ -499,8 +502,8 @@ g
h
h
g
-h
-h
+n
+n
g
h
h
@@ -542,7 +545,7 @@ h
g
g
h
-h
+n
g
g
h
@@ -634,9 +637,9 @@ h
h
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -676,9 +679,9 @@ h
h
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -808,7 +811,7 @@ h
g
h
g
-h
+n
g
h
h
@@ -886,9 +889,9 @@ C
g
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -928,9 +931,9 @@ g
h
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -1018,8 +1021,8 @@ h
g
h
g
-h
-h
+n
+n
g
h
h
@@ -1060,8 +1063,8 @@ h
g
h
g
-h
-h
+n
+n
g
h
h
@@ -1138,9 +1141,9 @@ h
h
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -1180,9 +1183,9 @@ h
h
h
g
-h
-h
-h
+n
+n
+n
g
h
g
@@ -1214,7 +1217,7 @@ h
h
g
h
-h
+n
g
C
h
@@ -1255,8 +1258,8 @@ g
h
h
g
-h
-h
+n
+n
g
h
h
@@ -1270,7 +1273,7 @@ h
g
h
g
-h
+n
g
h
h
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining24.dmm b/_maps/map_files/Mining/nsv13/ruins/mining24.dmm
index 7da91ca7f3e..4c5e0f90fa8 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining24.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining24.dmm
@@ -43,6 +43,9 @@
name = "nanoweave carpet (puce)"
},
/area/ruin/powered)
+"W" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"X" = (
/obj/structure/statue/uranium/nuke,
/turf/open/floor/carpet/ship/beige_carpet{
@@ -234,11 +237,11 @@ q
u
u
u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
u
u
q
@@ -275,14 +278,14 @@ q
q
u
u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
u
q
q
@@ -316,15 +319,15 @@ q
q
u
u
-u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
+W
u
q
q
@@ -357,16 +360,16 @@ q
q
q
u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
u
u
q
@@ -399,16 +402,16 @@ q
q
q
u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
u
q
q
@@ -664,16 +667,16 @@ u
u
u
u
+W
+W
+W
+W
u
-u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
u
u
q
@@ -701,19 +704,19 @@ q
q
u
u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
u
u
u
@@ -742,12 +745,12 @@ q
u
u
u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
u
u
u
@@ -783,8 +786,8 @@ q
q
u
u
-u
-u
+W
+W
u
u
u
@@ -824,7 +827,7 @@ q
q
u
u
-u
+W
u
u
u
@@ -1050,7 +1053,7 @@ u
u
u
u
-u
+W
u
u
u
@@ -1091,8 +1094,8 @@ u
u
u
u
-u
-u
+W
+W
u
u
q
@@ -1131,9 +1134,9 @@ u
u
u
u
-u
-u
-u
+W
+W
+W
u
u
q
@@ -1172,10 +1175,10 @@ u
u
u
u
-u
-u
-u
-u
+W
+W
+W
+W
u
q
q
@@ -1213,9 +1216,9 @@ u
u
u
u
-u
-u
-u
+W
+W
+W
u
u
q
@@ -1254,9 +1257,9 @@ u
u
u
u
-u
-u
-u
+W
+W
+W
u
u
q
@@ -1295,9 +1298,9 @@ u
u
u
u
-u
-u
-u
+W
+W
+W
u
u
u
@@ -1330,14 +1333,14 @@ u
u
u
u
+W
+W
u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
u
u
u
@@ -1371,14 +1374,14 @@ q
u
u
u
-u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
+W
u
u
u
@@ -1411,13 +1414,13 @@ q
q
q
u
-u
-u
-u
-u
-u
-u
-u
+W
+W
+W
+W
+W
+W
+W
u
u
u
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining25.dmm b/_maps/map_files/Mining/nsv13/ruins/mining25.dmm
index 8089c1cecbb..917405ece66 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining25.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining25.dmm
@@ -2,6 +2,9 @@
"g" = (
/turf/closed/mineral,
/area/ruin/powered)
+"l" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"m" = (
/turf/template_noop,
/area/template_noop)
@@ -223,8 +226,8 @@ m
m
g
g
-g
-g
+l
+l
g
g
g
@@ -263,14 +266,14 @@ m
m
g
g
-g
-g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
+l
+l
g
g
m
@@ -304,17 +307,17 @@ m
m
m
g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
m
m
m
@@ -351,13 +354,13 @@ g
g
g
g
-g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
+l
m
m
m
@@ -396,10 +399,10 @@ g
g
g
g
-g
-g
-g
-g
+l
+l
+l
+l
m
m
m
@@ -439,9 +442,9 @@ g
g
g
g
-g
-g
-g
+l
+l
+l
g
m
m
@@ -482,8 +485,8 @@ g
g
g
g
-g
-g
+l
+l
g
m
m
@@ -524,7 +527,7 @@ g
g
g
g
-g
+l
g
g
m
@@ -566,8 +569,8 @@ g
g
g
g
-g
-g
+l
+l
g
g
m
@@ -1067,9 +1070,9 @@ g
g
g
g
-g
-g
-g
+l
+l
+l
g
g
m
@@ -1109,9 +1112,9 @@ g
g
g
g
-g
-g
-g
+l
+l
+l
g
g
m
@@ -1149,11 +1152,11 @@ g
g
g
g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
g
m
m
@@ -1190,11 +1193,11 @@ g
g
g
g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
g
g
m
@@ -1230,12 +1233,12 @@ g
g
g
g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
g
g
m
@@ -1270,12 +1273,12 @@ g
g
g
g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
g
g
g
@@ -1310,13 +1313,13 @@ g
g
g
g
-g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
+l
g
g
g
@@ -1350,13 +1353,13 @@ m
m
g
g
-g
-g
-g
-g
-g
-g
-g
+l
+l
+l
+l
+l
+l
+l
g
g
g
@@ -1394,9 +1397,9 @@ m
g
g
g
-g
-g
-g
+l
+l
+l
g
g
g
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining26.dmm b/_maps/map_files/Mining/nsv13/ruins/mining26.dmm
index 4ce36a9b559..f08854983c5 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining26.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining26.dmm
@@ -11,6 +11,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"v" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"A" = (
/turf/open/floor/plating/asteroid,
/area/ruin/powered)
@@ -374,14 +377,14 @@ Z
Z
X
X
-X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
+v
X
X
X
@@ -416,14 +419,14 @@ X
X
X
X
-X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
+v
X
A
X
@@ -459,13 +462,13 @@ X
X
X
X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
X
A
A
@@ -743,8 +746,8 @@ Z
X
X
X
-X
-X
+v
+v
X
X
X
@@ -783,10 +786,10 @@ Z
Z
Z
X
-X
-X
-X
-X
+v
+v
+v
+v
X
X
X
@@ -825,10 +828,10 @@ Z
Z
X
X
-X
-X
-X
-X
+v
+v
+v
+v
X
X
X
@@ -867,9 +870,9 @@ Z
Z
X
X
-X
-X
-X
+v
+v
+v
X
X
X
@@ -909,9 +912,9 @@ Z
Z
X
X
-X
-X
-X
+v
+v
+v
X
X
X
@@ -951,9 +954,9 @@ Z
Z
X
X
-X
-X
-X
+v
+v
+v
X
X
X
@@ -993,9 +996,9 @@ Z
Z
Z
X
-X
-X
-X
+v
+v
+v
X
X
X
@@ -1035,10 +1038,10 @@ Z
Z
Z
X
-X
-X
-X
-X
+v
+v
+v
+v
X
X
X
@@ -1078,10 +1081,10 @@ Z
Z
X
X
-X
-X
-X
-X
+v
+v
+v
+v
X
X
X
@@ -1120,15 +1123,15 @@ Z
Z
X
X
-X
-X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
+v
+v
X
X
X
@@ -1163,16 +1166,16 @@ Z
Z
X
X
-X
-X
-X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
X
X
X
@@ -1206,14 +1209,14 @@ Z
Z
X
X
-X
-X
-X
-X
-X
-X
-X
-X
+v
+v
+v
+v
+v
+v
+v
+v
X
X
X
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining27.dmm b/_maps/map_files/Mining/nsv13/ruins/mining27.dmm
index 91b35c19cea..3ad3557ec8a 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining27.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining27.dmm
@@ -9,6 +9,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"K" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"O" = (
/obj/item/stack/sheet/mineral/sandstone{
desc = "It's a brick.";
@@ -284,9 +287,9 @@ p
Y
Y
Y
-Y
-Y
-Y
+K
+K
+K
Y
Y
Y
@@ -326,16 +329,16 @@ Y
Y
Y
Y
+K
+K
+K
+K
+K
Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
Y
Y
Y
@@ -369,17 +372,17 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
Y
Y
Y
@@ -414,16 +417,16 @@ Y
Y
Y
Y
+K
Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
+K
+K
+K
+K
Y
Y
Y
@@ -461,13 +464,13 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
+K
+K
+K
Y
Y
Y
@@ -507,12 +510,12 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
+K
+K
Y
Y
p
@@ -552,10 +555,10 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
Y
Y
p
@@ -595,10 +598,10 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
Y
Y
p
@@ -638,10 +641,10 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
Y
Y
p
@@ -681,10 +684,10 @@ Y
Y
Y
Y
-Y
-Y
-Y
-Y
+K
+K
+K
+K
Y
p
p
@@ -725,8 +728,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
Y
p
@@ -768,8 +771,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
p
p
@@ -811,8 +814,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
p
p
@@ -853,8 +856,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
p
p
@@ -896,8 +899,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
p
p
@@ -938,8 +941,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
Y
p
@@ -981,7 +984,7 @@ Y
Y
Y
Y
-Y
+K
Y
Y
p
@@ -1023,8 +1026,8 @@ Y
Y
Y
Y
-Y
-Y
+K
+K
Y
p
"}
@@ -1066,7 +1069,7 @@ Y
Y
Y
Y
-Y
+K
Y
p
"}
@@ -1108,7 +1111,7 @@ Y
Y
Y
Y
-Y
+K
Y
p
"}
@@ -1150,7 +1153,7 @@ Y
Y
Y
Y
-Y
+K
Y
p
"}
@@ -1192,7 +1195,7 @@ Y
Y
Y
Y
-Y
+K
p
p
"}
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining28.dmm b/_maps/map_files/Mining/nsv13/ruins/mining28.dmm
index aafe4fd671d..90e57f251c0 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining28.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining28.dmm
@@ -8,12 +8,12 @@
/turf/template_noop,
/area/template_noop)
"aO" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
/obj/machinery/light{
dir = 8
},
+/obj/structure/chair/fancy/comfy{
+ dir = 4
+ },
/turf/open/floor/carpet/ship/orange_carpet,
/area/ruin/powered)
"bi" = (
@@ -27,7 +27,7 @@
/turf/closed/wall/steel,
/area/ruin/powered)
"dK" = (
-/obj/structure/chair/sofa,
+/obj/structure/chair/fancy/sofa/corp,
/turf/open/floor/carpet/royalblack,
/area/ruin/powered)
"dZ" = (
@@ -37,10 +37,10 @@
/turf/open/floor/carpet/orange,
/area/ruin/powered)
"hq" = (
-/obj/structure/chair/comfy/brown{
+/obj/structure/chair/fancy/sofa/corp/corner/concave{
dir = 4
},
-/turf/open/floor/carpet/green,
+/turf/open/floor/carpet/royalblack,
/area/ruin/powered)
"hs" = (
/obj/effect/decal/cleanable/crayon{
@@ -103,7 +103,7 @@
/turf/open/floor/carpet/ship/blue,
/area/ruin/powered)
"pz" = (
-/obj/structure/chair/sofa/left,
+/obj/structure/chair/fancy/sofa/corp/left,
/turf/open/floor/carpet/royalblack,
/area/ruin/powered)
"pW" = (
@@ -171,14 +171,11 @@
/turf/open/floor/plating,
/area/ruin/powered)
"yn" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/fancy/sofa/mono/left,
/turf/open/floor/carpet/blue,
/area/ruin/powered)
"yy" = (
-/obj/structure/chair/comfy/brown{
- dir = 1
- },
-/turf/open/floor/carpet/green,
+/turf/closed/mineral/random,
/area/ruin/powered)
"Am" = (
/obj/structure/table/wood,
@@ -211,7 +208,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"EQ" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/fancy/comfy{
dir = 4
},
/turf/open/floor/carpet/ship/orange_carpet,
@@ -232,8 +229,8 @@
/turf/open/floor/carpet/blue,
/area/ruin/powered)
"ID" = (
-/obj/structure/chair/sofa/right,
-/turf/open/floor/carpet/royalblack,
+/obj/structure/chair/fancy/sofa/mono/right,
+/turf/open/floor/carpet/blue,
/area/ruin/powered)
"Jm" = (
/turf/open/floor/carpet/green,
@@ -337,6 +334,9 @@
/turf/open/floor/wood,
/area/ruin/powered)
"Ye" = (
+/obj/structure/chair/fancy/sofa/corp/right{
+ dir = 4
+ },
/turf/open/floor/carpet/royalblack,
/area/ruin/powered)
"Zg" = (
@@ -344,9 +344,6 @@
/turf/open/floor/carpet/black,
/area/ruin/powered)
"ZH" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
/turf/open/floor/carpet/ship/orange_carpet,
/area/ruin/powered)
"ZR" = (
@@ -501,9 +498,9 @@ rg
rg
rg
rg
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -542,11 +539,11 @@ rg
rg
rg
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
bF
@@ -583,11 +580,11 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
bF
@@ -624,12 +621,12 @@ rg
PV
PV
PV
-PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
+yy
PV
PV
bF
@@ -664,13 +661,13 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -706,11 +703,11 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -747,11 +744,11 @@ rg
rg
PV
PV
+yy
+yy
PV
-PV
-PV
-PV
-PV
+yy
+yy
PV
PV
PV
@@ -788,10 +785,10 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -829,9 +826,9 @@ rg
rg
PV
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -870,10 +867,10 @@ rg
rg
rg
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -912,10 +909,10 @@ rg
rg
rg
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -938,7 +935,7 @@ kP
nt
nt
kP
-yn
+ID
It
rG
rg
@@ -953,10 +950,10 @@ rg
rg
rg
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -971,7 +968,7 @@ PV
PV
PV
bF
-Ye
+hq
Ye
kP
hR
@@ -995,9 +992,9 @@ rg
rg
rg
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1013,7 +1010,7 @@ PV
PV
PV
bF
-ID
+dK
TH
kP
dZ
@@ -1037,9 +1034,9 @@ rg
rg
rg
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1079,9 +1076,9 @@ rg
rg
PV
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1121,9 +1118,9 @@ rg
PV
PV
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1163,10 +1160,10 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1206,10 +1203,10 @@ rg
PV
PV
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1248,11 +1245,11 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1270,8 +1267,8 @@ on
sY
kP
Jm
-hq
-hq
+Jm
+Jm
Jm
kP
Wl
@@ -1290,12 +1287,12 @@ rg
rg
rg
PV
-PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1314,7 +1311,7 @@ kP
Jm
Ox
Ox
-yy
+Jm
kP
Zg
Wl
@@ -1333,10 +1330,10 @@ rg
rg
PV
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1356,7 +1353,7 @@ kP
Jm
Ox
Ox
-yy
+Jm
kP
wS
Qv
@@ -1376,11 +1373,11 @@ rg
PV
PV
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1419,9 +1416,9 @@ rg
PV
PV
PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1461,10 +1458,10 @@ rg
PV
PV
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1504,11 +1501,11 @@ rg
PV
PV
PV
+yy
+yy
+yy
PV
-PV
-PV
-PV
-PV
+yy
PV
PV
PV
@@ -1547,11 +1544,11 @@ rg
PV
PV
PV
+yy
+yy
PV
-PV
-PV
-PV
-PV
+yy
+yy
PV
PV
PV
@@ -1589,11 +1586,11 @@ rg
PV
PV
PV
-PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
+yy
+yy
PV
PV
PV
@@ -1632,11 +1629,11 @@ rg
PV
PV
PV
+yy
PV
-PV
-PV
-PV
-PV
+yy
+yy
+yy
PV
PV
PV
@@ -1676,8 +1673,8 @@ PV
PV
PV
PV
-PV
-PV
+yy
+yy
PV
PV
PV
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining29.dmm b/_maps/map_files/Mining/nsv13/ruins/mining29.dmm
index 77f7a0f2c15..5825c3fa780 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining29.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining29.dmm
@@ -82,6 +82,9 @@
"O" = (
/turf/template_noop,
/area/template_noop)
+"R" = (
+/turf/closed/mineral/random/high_chance,
+/area/ruin/powered)
"V" = (
/turf/open/floor/plating/abductor{
initial_gas_mix = "TEMP=2.7"
@@ -463,7 +466,7 @@ r
r
r
r
-r
+R
r
r
r
@@ -504,8 +507,8 @@ r
r
r
r
-r
-r
+R
+R
r
r
r
@@ -546,8 +549,8 @@ r
r
r
r
-r
-r
+R
+R
r
r
q
@@ -673,7 +676,7 @@ r
r
r
r
-r
+R
r
q
d
@@ -715,7 +718,7 @@ r
r
r
r
-r
+R
r
q
K
@@ -841,6 +844,7 @@ r
r
r
r
+R
r
r
r
@@ -850,8 +854,7 @@ r
r
r
r
-r
-r
+R
r
r
O
@@ -883,17 +886,17 @@ r
r
r
r
+R
+R
+R
r
r
r
r
r
r
-r
-r
-r
-r
-r
+R
+R
r
r
O
@@ -934,7 +937,7 @@ r
r
r
r
-r
+R
r
r
O
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining5.dmm b/_maps/map_files/Mining/nsv13/ruins/mining5.dmm
index 753f31d0c09..8d2b2a8b144 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining5.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining5.dmm
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/template_noop,
-/area/space)
+/area/template_noop)
"ab" = (
/turf/closed/wall/r_wall/ship,
/area/ruin/unpowered)
@@ -37,7 +37,7 @@
icon_state = "2-4"
},
/turf/template_noop,
-/area/space)
+/area/template_noop)
"ah" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -75,7 +75,7 @@
icon_state = "4-8"
},
/turf/template_noop,
-/area/space)
+/area/template_noop)
"am" = (
/obj/machinery/door/airlock/ship/maintenance{
req_one_access_txt = "201"
@@ -88,12 +88,12 @@
"an" = (
/obj/structure/lattice,
/turf/template_noop,
-/area/space)
+/area/template_noop)
"ao" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ap" = (
/obj/structure/cable{
@@ -101,21 +101,21 @@
},
/obj/structure/table_frame,
/obj/item/shard,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aq" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ar" = (
/obj/structure/table/glass,
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"as" = (
/obj/structure/grille/broken,
@@ -149,29 +149,20 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"ax" = (
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ay" = (
-/obj/structure/chair/sofa/right{
- dir = 1
- },
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"az" = (
-/obj/structure/chair/sofa{
- dir = 1
- },
-/turf/open/floor/plasteel/ship,
-/area/ruin/unpowered)
-"aA" = (
-/obj/structure/chair/sofa/left{
- dir = 1
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+ dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"aB" = (
/obj/item/shard,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aC" = (
/obj/machinery/atmospherics/components/unary/portables_connector,
@@ -188,27 +179,27 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"aE" = (
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/carpet/ship/red_carpet,
/area/ruin/unpowered)
"aF" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aG" = (
/obj/machinery/light/broken{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aI" = (
/obj/machinery/atmospherics/components/unary/vent_pump,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -236,7 +227,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -245,25 +236,25 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aO" = (
/turf/open/floor/plasteel/airless/solarpanel,
-/area/space)
+/area/template_noop)
"aP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/light/broken,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -272,7 +263,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aR" = (
/obj/structure/grille/broken,
@@ -289,12 +280,12 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"aU" = (
/turf/open/floor/plating,
@@ -311,20 +302,20 @@
default_raw_text = "It's been days since they evacuated and I have at this point. Blatantly nobody will miss me, so I have no request to a loved one.
I have but one request to you who are reading this: Do.
Not
Open
The
Sarcophagus";
name = "last will"
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/carpet/ship/red_carpet,
/area/ruin/unpowered)
"aX" = (
/obj/structure/bed,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/carpet/ship/red_carpet,
/area/ruin/unpowered)
"aY" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"aZ" = (
/obj/structure/rack,
/obj/item/ammo_box/magazine/sniper_rounds,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ba" = (
/obj/structure/rack,
@@ -333,31 +324,31 @@
},
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bb" = (
/obj/structure/rack,
/obj/item/ammo_box/magazine/wt550m9/wtap,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bc" = (
/obj/structure/rack,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bd" = (
/obj/item/megaphone,
/obj/structure/rack,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"be" = (
/obj/structure/rack,
/obj/item/melee/flyswatter,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bf" = (
/obj/structure/rack,
/obj/item/slapper,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bg" = (
/obj/machinery/light/broken{
@@ -365,7 +356,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bh" = (
/obj/structure/cable{
@@ -376,22 +367,22 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bi" = (
/obj/item/bedsheet/red,
/obj/machinery/light/small/broken,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/carpet/ship/red_carpet,
/area/ruin/unpowered)
"bj" = (
/obj/effect/mob_spawn/human/corpse/assistant,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/carpet/ship/red_carpet,
/area/ruin/unpowered)
"bk" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bl" = (
/obj/structure/lattice/catwalk,
@@ -399,7 +390,7 @@
icon_state = "1-2"
},
/turf/template_noop,
-/area/space)
+/area/template_noop)
"bm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -407,7 +398,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -416,12 +407,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bo" = (
/obj/item/shard,
/turf/template_noop,
-/area/space)
+/area/template_noop)
"bp" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -434,15 +425,15 @@
icon_state = "1-2"
},
/turf/template_noop,
-/area/space)
+/area/template_noop)
"bq" = (
/obj/item/shard,
/turf/open/floor/plasteel/airless/solarpanel,
-/area/space)
+/area/template_noop)
"br" = (
/obj/item/stack/sheet/iron,
/turf/open/floor/plasteel/airless/solarpanel,
-/area/space)
+/area/template_noop)
"bs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -454,7 +445,7 @@
name = "Special equipment";
req_one_access_txt = "203"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bt" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -463,43 +454,43 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bu" = (
/obj/item/stack/sheet/iron,
/turf/template_noop,
-/area/space)
+/area/template_noop)
"bv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/mob/living/simple_animal/hostile/retaliate/bat,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bw" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bx" = (
/obj/machinery/light/broken{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"by" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bA" = (
/obj/machinery/door/airlock/ship/maintenance{
@@ -529,34 +520,34 @@
/obj/machinery/door/airlock/ship/security/glass{
req_one_access_txt = "203"
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"bE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bG" = (
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"bH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bI" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bJ" = (
/obj/structure/cable{
@@ -574,13 +565,13 @@
"bL" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -589,7 +580,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 6
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bO" = (
/obj/machinery/door/airlock/ship/security/glass{
@@ -602,7 +593,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -611,7 +602,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 9
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -620,19 +611,19 @@
/obj/item/kirbyplants{
icon_state = "plant-23"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bR" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bS" = (
/obj/machinery/suit_storage_unit,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bT" = (
/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bU" = (
/obj/structure/cable{
@@ -645,7 +636,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bW" = (
/obj/structure/cable{
@@ -655,31 +646,31 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"bX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"bZ" = (
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ca" = (
/obj/structure/frame/computer{
anchored = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cb" = (
/obj/structure/cable{
@@ -695,7 +686,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ce" = (
/obj/structure/cable{
@@ -710,7 +701,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cf" = (
/obj/machinery/door/airlock/ship/security/glass{
@@ -725,7 +716,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cg" = (
/obj/structure/disposalpipe/segment{
@@ -735,7 +726,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ch" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
@@ -744,14 +735,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ci" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cj" = (
/obj/structure/chair/office{
@@ -760,7 +751,7 @@
/obj/machinery/light/broken{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"ck" = (
/turf/template_noop,
@@ -779,16 +770,16 @@
/area/ruin/unpowered)
"cn" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"co" = (
/obj/structure/table,
/obj/machinery/recharger,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cp" = (
/obj/item/shard,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cq" = (
/turf/closed/mineral/random,
@@ -801,7 +792,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cs" = (
/obj/machinery/light/broken{
@@ -810,7 +801,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"ct" = (
/obj/structure/cable{
@@ -819,42 +810,42 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cu" = (
/obj/structure/filingcabinet,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cv" = (
/obj/machinery/photocopier,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cw" = (
/obj/machinery/light/broken{
dir = 8
},
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cx" = (
/obj/structure/toilet,
/obj/machinery/light/small/broken{
dir = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cy" = (
/obj/machinery/shower{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cz" = (
/obj/machinery/shower{
dir = 8
},
/obj/structure/floodlight_frame,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cA" = (
/obj/structure/stone_tile/cracked{
@@ -898,19 +889,19 @@
"cB" = (
/obj/structure/chair/office/light,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cC" = (
/obj/item/stack/sheet/iron,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cD" = (
/obj/machinery/door/window/southleft,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cE" = (
/obj/machinery/door/window/southright,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cF" = (
/obj/structure/statue/bananium/clown,
@@ -921,13 +912,13 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cI" = (
/obj/structure/table/wood,
@@ -935,21 +926,21 @@
default_raw_text = "Captain's orders:
Evacuate, and relocate the armoury to the exit point. We've lost a few heads already.
Burn the infected to hamper the disease.";
name = "captain's orders"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cJ" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cK" = (
/obj/structure/table_frame/wood,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cL" = (
/obj/machinery/atmospherics/components/unary/vent_pump,
/obj/item/grown/bananapeel,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cM" = (
/obj/structure/cable{
@@ -978,31 +969,31 @@
/area/ruin/unpowered)
"cR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cS" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cT" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"cU" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cV" = (
/obj/structure/disposalpipe/junction,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cW" = (
/obj/structure/cable{
@@ -1014,7 +1005,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"cX" = (
/obj/structure/holosign/barrier,
@@ -1027,7 +1018,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"cY" = (
/obj/structure/cable{
@@ -1054,7 +1045,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"da" = (
/obj/structure/cable{
@@ -1100,7 +1091,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"di" = (
/obj/machinery/door/airlock/ship/public/glass,
@@ -1110,7 +1101,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
/area/ruin/unpowered)
"dj" = (
/obj/structure/disposalpipe/segment{
@@ -1119,7 +1109,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dk" = (
/obj/structure/disposalpipe/segment{
@@ -1131,7 +1121,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dl" = (
/obj/structure/disposalpipe/segment{
@@ -1140,38 +1130,38 @@
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dm" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dn" = (
/obj/machinery/vending/snack/random,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"do" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 4
},
/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dp" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dr" = (
/obj/structure/girder,
@@ -1180,7 +1170,7 @@
"ds" = (
/obj/item/stack/sheet/iron,
/obj/item/grown/bananapeel,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"dt" = (
/obj/structure/floodlight_frame,
@@ -1192,11 +1182,11 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"dv" = (
/obj/item/grown/bananapeel,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"dx" = (
/obj/structure/stone_tile/block/cracked,
@@ -1206,15 +1196,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dz" = (
/obj/machinery/light/broken,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dA" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"dB" = (
/obj/structure/disposaloutlet{
@@ -1236,13 +1226,13 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dE" = (
/obj/structure/disposalpipe/junction/yjunction{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dF" = (
/obj/machinery/door/airlock/ship/maintenance{
@@ -1258,7 +1248,7 @@
/area/ruin/unpowered)
"dH" = (
/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dI" = (
/obj/structure/janitorialcart{
@@ -1283,7 +1273,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dM" = (
/obj/machinery/light/small/broken{
@@ -1318,14 +1308,14 @@
dir = 8
},
/turf/open/floor/plating/airless,
-/area/ruin/unpowered)
+/area/template_noop)
"dR" = (
/obj/machinery/light/broken{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dS" = (
/obj/machinery/door/airlock/ship/maintenance{
@@ -1336,7 +1326,7 @@
/area/ruin/unpowered)
"dT" = (
/obj/machinery/washing_machine,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dU" = (
/obj/structure/table,
@@ -1357,17 +1347,17 @@
/area/ruin/unpowered)
"dX" = (
/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dY" = (
/obj/structure/chair{
dir = 4
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"dZ" = (
/obj/structure/table/glass,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ea" = (
/obj/structure/sink/kitchen{
@@ -1376,63 +1366,65 @@
/obj/machinery/light/broken{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eb" = (
/obj/structure/closet/secure_closet/freezer/fridge/open,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"ec" = (
/obj/structure/closet/secure_closet/freezer/meat/open,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"ed" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ee" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8
},
/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ef" = (
/obj/structure/lattice/catwalk,
/turf/template_noop,
-/area/ruin/unpowered)
+/area/template_noop)
"eg" = (
/obj/structure/bedsheetbin,
/obj/structure/table,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eh" = (
/obj/machinery/vending/autodrobe,
/turf/open/floor/plating,
/area/ruin/unpowered)
"ei" = (
-/obj/item/chair{
+/obj/machinery/atmospherics/components/unary/vent_pump{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ej" = (
/obj/structure/table_frame,
/obj/item/shard,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ek" = (
-/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"el" = (
/obj/item/chair{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"em" = (
/obj/structure/table/reinforced,
@@ -1443,12 +1435,12 @@
/obj/item/chair{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eo" = (
/obj/item/book/manual/chef_recipes,
/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"ep" = (
/obj/structure/grille/broken,
@@ -1459,15 +1451,17 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"eq" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/ship/public/glass,
-/turf/open/floor/plasteel/ship/padded,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/durasteel,
/area/ruin/unpowered)
"er" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/ship/public/glass,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"es" = (
/obj/machinery/light/broken{
@@ -1475,20 +1469,20 @@
},
/obj/item/shard,
/obj/effect/decal/cleanable/ash,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"et" = (
/obj/item/chair,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eu" = (
/obj/structure/bonfire/prelit,
/obj/effect/mob_spawn/human/corpse/cargo_tech,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ev" = (
/obj/effect/decal/cleanable/ash,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"ew" = (
/obj/structure/table/reinforced,
@@ -1496,12 +1490,12 @@
/area/ruin/unpowered)
"ex" = (
/obj/machinery/atmospherics/components/unary/vent_pump,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"ey" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"ez" = (
/obj/effect/spawner/structure/window,
@@ -1509,13 +1503,13 @@
/area/ruin/unpowered)
"eA" = (
/obj/structure/chair,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eB" = (
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eC" = (
/obj/structure/disposalpipe/segment{
@@ -1527,7 +1521,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eD" = (
/obj/structure/disposalpipe/segment{
@@ -1539,7 +1533,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eE" = (
/obj/structure/disposalpipe/segment{
@@ -1555,7 +1549,7 @@
default_raw_text = "Captain's orders:
Evacuate, and relocate the armoury to the exit point. We've lost a few heads already.
Burn the infected to hamper the disease.";
name = "captain's orders"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eF" = (
/obj/structure/disposalpipe/segment{
@@ -1567,19 +1561,12 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 1
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/plasteel/ship,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eH" = (
/obj/structure/disposalpipe/segment{
@@ -1592,7 +1579,7 @@
dir = 8
},
/obj/machinery/door/airlock/ship/public/glass,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eI" = (
/obj/structure/disposalpipe/segment{
@@ -1604,7 +1591,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eJ" = (
/obj/structure/disposalpipe/segment{
@@ -1617,7 +1604,7 @@
dir = 8
},
/obj/item/grown/bananapeel,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eK" = (
/obj/structure/disposalpipe/segment{
@@ -1629,7 +1616,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -1639,19 +1626,19 @@
dir = 1
},
/obj/item/shard,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eN" = (
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eO" = (
/obj/item/paper/fluff/ruins/asteroid4/extraction{
@@ -1659,36 +1646,36 @@
name = "captain's orders"
},
/obj/structure/table,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eP" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eQ" = (
/obj/machinery/light/broken,
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eR" = (
/obj/item/shard,
/obj/structure/table_frame,
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eS" = (
/obj/item/chair{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eT" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/ash,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -1696,7 +1683,7 @@
/obj/item/chair{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eV" = (
/obj/structure/table/glass,
@@ -1704,48 +1691,48 @@
default_raw_text = "Captain's orders:
Evacuate, and relocate the armoury to the exit point. We've lost a few heads already.
Burn the infected to hamper the disease.";
name = "captain's orders"
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eW" = (
/obj/structure/chair{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"eX" = (
/obj/structure/closet/chefcloset,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eY" = (
/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"eZ" = (
/obj/structure/table,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fa" = (
/obj/machinery/door/airlock/ship/station{
name = "Dormatory one"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fb" = (
/obj/machinery/door/airlock/ship/station{
name = "Dormatory two"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fc" = (
/obj/machinery/door/airlock/ship/station{
name = "Dormatory three"
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/ship/public/glass,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fe" = (
/obj/effect/spawner/structure/window,
@@ -1760,21 +1747,21 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"fg" = (
/obj/structure/bed,
/obj/item/bedsheet/ian,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fh" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fi" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/ship,
+/obj/item/grown/bananapeel,
+/turf/open/floor/durasteel/riveted,
/area/ruin/unpowered)
"fj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1783,7 +1770,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fk" = (
/obj/machinery/light/broken{
@@ -1795,12 +1782,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fl" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1809,46 +1796,36 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 4
},
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fn" = (
/obj/machinery/light/small/broken,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fo" = (
/obj/structure/bed,
/obj/item/bedsheet/clown,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fp" = (
/obj/machinery/light/small/broken,
/obj/effect/gibspawner/human,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fq" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/item/stack/spacecash/c50,
-/turf/open/floor/plasteel/ship,
+/turf/open/floor/carpet/ship/blue,
/area/ruin/unpowered)
"fr" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/noslip/vaporwave,
/area/ruin/unpowered)
"fs" = (
/obj/structure/disposalpipe/junction/yjunction{
dir = 1
},
-/turf/open/floor/plasteel/ship/padded,
-/area/ruin/unpowered)
-"ft" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fu" = (
/obj/structure/disposalpipe/segment{
@@ -1857,7 +1834,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fv" = (
/obj/structure/disposalpipe/segment{
@@ -1866,19 +1843,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
-/turf/open/floor/plasteel/ship/padded,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"fw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
dir = 8
},
/obj/item/kirbyplants/random,
-/turf/open/floor/plasteel/ship/techfloor/alt,
+/turf/open/floor/durasteel/padded,
/area/ruin/unpowered)
"Qo" = (
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
-/area/space)
+/area/template_noop)
(1,1,1) = {"
aa
@@ -2222,13 +2199,13 @@ aa
ab
aj
av
-aE
-aE
-aE
-aE
-aE
-aE
-aE
+ay
+ay
+ay
+ay
+ay
+ay
+ay
bV
cd
cn
@@ -2244,9 +2221,9 @@ cn
cn
cn
cn
-eq
+fd
eB
-aE
+ay
fa
bG
fn
@@ -2288,7 +2265,7 @@ aT
aT
er
eC
-aE
+ay
av
fg
fo
@@ -2306,7 +2283,7 @@ aa
ab
aj
av
-aE
+ay
aM
ab
ab
@@ -2372,7 +2349,7 @@ av
eh
av
eE
-aE
+ay
fb
bG
fn
@@ -2390,7 +2367,7 @@ aa
ab
aj
av
-aE
+ay
aM
ab
aE
@@ -2399,7 +2376,7 @@ bD
bM
bY
ch
-bG
+ax
av
av
av
@@ -2445,7 +2422,7 @@ bH
av
cy
cD
-bG
+ax
da
du
av
@@ -2455,8 +2432,8 @@ av
av
aU
av
-eG
-aE
+eI
+ay
av
av
av
@@ -2474,13 +2451,13 @@ aa
ab
aj
av
-aE
+ay
aM
ab
aX
bj
ab
-aM
+bn
ca
cj
cp
@@ -2489,7 +2466,7 @@ cz
cE
cM
db
-dv
+fi
dF
dK
aU
@@ -2497,8 +2474,8 @@ aU
dK
aU
av
-eG
-aE
+eI
+ay
fc
dv
fp
@@ -2516,7 +2493,7 @@ aa
ab
am
av
-aE
+ay
aM
ab
ab
@@ -2557,8 +2534,8 @@ aa
aa
ab
ao
-ax
-aE
+ay
+ay
aM
ab
aY
@@ -2579,7 +2556,7 @@ ae
ck
ad
dX
-aE
+ay
es
eI
eR
@@ -2600,7 +2577,7 @@ aa
ad
ap
ay
-aE
+ay
aM
ab
aZ
@@ -2621,13 +2598,13 @@ ae
ae
ad
dY
-ei
+el
et
eJ
eS
ez
-aE
-fr
+ay
+cU
ab
aa
aa
@@ -2641,7 +2618,7 @@ aa
aa
ad
aq
-az
+ay
aI
aP
ab
@@ -2668,7 +2645,7 @@ eu
eK
eT
fd
-fi
+cn
fs
ad
aa
@@ -2683,8 +2660,8 @@ aa
aa
ad
ar
-aA
-aE
+ay
+ay
aM
ab
bb
@@ -2705,13 +2682,13 @@ cq
ae
ab
dZ
-ek
+dX
ev
eL
eU
fe
fj
-ft
+dD
ad
aa
aa
@@ -2726,12 +2703,12 @@ aa
ab
ao
aB
-aE
+ay
aM
ab
bc
-aM
-bG
+bn
+ax
bc
ab
ae
@@ -2746,14 +2723,14 @@ cq
cq
ae
ad
-aE
-ax
-ax
-ch
+ay
+ay
+ay
+ei
eV
av
aM
-ft
+dD
ad
aa
aa
@@ -2768,7 +2745,7 @@ aa
ab
am
av
-aE
+ay
aM
ab
ab
@@ -2790,12 +2767,12 @@ ck
ad
dX
el
-aE
+ay
cH
eW
av
fk
-ft
+dD
ab
aa
aa
@@ -2810,7 +2787,7 @@ aa
ab
aj
av
-aE
+ay
aM
ab
bd
@@ -2837,7 +2814,7 @@ ew
av
av
aM
-ft
+dD
ad
aa
aa
@@ -2852,7 +2829,7 @@ aa
ab
aj
av
-aE
+ay
aM
ab
be
@@ -2873,13 +2850,13 @@ ae
ae
ab
ea
-bG
-bG
-dy
+fr
+fr
+az
eX
av
aM
-ft
+dD
ad
aa
aa
@@ -2918,10 +2895,10 @@ eb
en
ex
eM
-aT
+eG
ff
fl
-ft
+dD
ab
aa
aa
@@ -2941,7 +2918,7 @@ aN
ab
bf
bx
-bG
+ax
bT
ab
ck
@@ -2963,7 +2940,7 @@ eN
eY
av
aM
-ft
+dD
ad
aa
aa
@@ -2978,7 +2955,7 @@ aa
ab
aj
av
-aE
+ay
aM
ab
ab
@@ -3005,7 +2982,7 @@ ez
av
av
aM
-ft
+dD
ad
aa
aa
@@ -3020,7 +2997,7 @@ aa
ab
aj
av
-aE
+ay
aQ
aT
bg
@@ -3062,20 +3039,20 @@ aa
ab
aj
av
-aE
-aE
-aE
-aE
+ay
+ay
+ay
+ay
bz
bI
-aE
-aE
-aE
-aE
+ay
+ay
+ay
+ay
bz
-aE
+ay
cH
-aE
+ay
dh
cn
cn
@@ -3125,12 +3102,12 @@ av
av
ab
ee
-ax
+ay
eA
eO
eZ
-ax
-ax
+ay
+ay
fw
ab
aa
@@ -3157,9 +3134,9 @@ cb
cl
av
cs
-bG
+ek
cI
-bG
+ek
dj
dy
av
@@ -3203,7 +3180,7 @@ cB
cJ
cR
dk
-dq
+eq
dG
dN
aU
@@ -3240,10 +3217,10 @@ ab
ab
ab
ab
-bG
-bG
+ek
+ek
cK
-bG
+ek
dl
dz
av
@@ -3283,11 +3260,11 @@ ae
ae
ab
cu
-bG
+ek
ab
cS
dm
-bG
+ek
ab
dP
ad
@@ -3325,15 +3302,15 @@ aa
ae
ab
cv
-bG
+ek
ab
cT
dn
dA
ab
dQ
-ae
-ae
+an
+an
aa
aa
aa
@@ -3373,7 +3350,7 @@ ad
ad
ab
ab
-ae
+an
aa
aa
aa
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining6.dmm b/_maps/map_files/Mining/nsv13/ruins/mining6.dmm
index dbeb382c728..019c9a7576f 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining6.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining6.dmm
@@ -59,9 +59,6 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/comfy/shuttle{
- dir = 4
- },
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/unpowered)
"q" = (
@@ -158,6 +155,10 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"L" = (
+/obj/effect/mob_spawn/human/corpse/assistant,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
"M" = (
/obj/structure/barricade/wooden,
/obj/structure/door_assembly,
@@ -998,7 +999,7 @@ C
E
H
H
-H
+L
H
H
M
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining7.dmm b/_maps/map_files/Mining/nsv13/ruins/mining7.dmm
index 832802fc74b..cd9a63a0d0a 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining7.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining7.dmm
@@ -242,6 +242,9 @@
/obj/structure/lattice/catwalk,
/turf/template_noop,
/area/template_noop)
+"Y" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
"Z" = (
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
@@ -519,14 +522,14 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -560,16 +563,16 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -597,23 +600,23 @@ a
a
a
a
-b
-b
+Y
+Y
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -639,24 +642,24 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
c
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -680,16 +683,16 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
e
c
@@ -697,9 +700,9 @@ h
c
c
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -722,15 +725,15 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
f
@@ -740,9 +743,9 @@ e
c
g
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -762,16 +765,16 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -783,8 +786,8 @@ c
c
e
c
-b
-b
+Y
+Y
a
a
a
@@ -804,16 +807,16 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
d
@@ -825,8 +828,8 @@ q
c
c
c
-b
-b
+Y
+Y
a
a
a
@@ -845,17 +848,17 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -867,8 +870,8 @@ c
c
c
c
-b
-b
+Y
+Y
a
a
a
@@ -887,18 +890,18 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
e
c
@@ -909,9 +912,9 @@ i
c
e
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -929,18 +932,18 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -952,9 +955,9 @@ c
c
c
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -972,18 +975,18 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -995,9 +998,9 @@ y
C
c
c
-b
-b
-b
+Y
+Y
+Y
a
a
a
@@ -1014,19 +1017,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1039,8 +1042,8 @@ I
p
p
p
-b
-b
+Y
+Y
T
a
a
@@ -1057,18 +1060,18 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
h
c
c
@@ -1081,7 +1084,7 @@ w
w
N
p
-b
+Y
U
W
a
@@ -1097,20 +1100,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
m
@@ -1140,19 +1143,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1182,19 +1185,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
i
@@ -1224,19 +1227,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1266,19 +1269,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
k
c
@@ -1308,19 +1311,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
l
c
@@ -1349,20 +1352,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1391,20 +1394,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1433,20 +1436,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1475,20 +1478,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1499,8 +1502,8 @@ c
H
j
M
-b
-b
+Y
+Y
a
a
a
@@ -1518,19 +1521,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1541,8 +1544,8 @@ B
d
c
c
-b
-b
+Y
+Y
a
a
a
@@ -1560,19 +1563,19 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
c
@@ -1583,8 +1586,8 @@ c
c
c
c
-b
-b
+Y
+Y
a
a
a
@@ -1602,31 +1605,31 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1645,29 +1648,29 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1690,24 +1693,24 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1733,22 +1736,22 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1776,20 +1779,20 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1819,17 +1822,17 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -1862,15 +1865,15 @@ a
a
a
a
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
a
a
-b
-b
+Y
+Y
a
a
a
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining8.dmm b/_maps/map_files/Mining/nsv13/ruins/mining8.dmm
index 371b28387c6..62e1524571c 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining8.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining8.dmm
@@ -403,6 +403,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"LK" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
aa
@@ -451,10 +454,10 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -492,12 +495,12 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -533,14 +536,14 @@ aa
(4,1,1) = {"
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -575,14 +578,14 @@ aa
(5,1,1) = {"
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -616,15 +619,15 @@ aa
"}
(6,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -658,15 +661,15 @@ aa
"}
(7,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -700,15 +703,15 @@ aa
"}
(8,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -743,14 +746,14 @@ aa
(9,1,1) = {"
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -786,12 +789,12 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -829,10 +832,10 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1085,9 +1088,9 @@ aa
aa
aa
aa
-ab
-ab
-ab
+LK
+LK
+LK
aa
aa
aa
@@ -1126,11 +1129,11 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1168,12 +1171,12 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
ab
@@ -1209,13 +1212,13 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
ab
ab
@@ -1251,13 +1254,13 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
ab
ab
@@ -1294,12 +1297,12 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
aa
ab
ab
@@ -1337,11 +1340,11 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
aa
ab
ab
@@ -1380,9 +1383,9 @@ aa
aa
aa
aa
-ab
-ab
-ab
+LK
+LK
+LK
aa
aa
aa
@@ -1423,7 +1426,7 @@ aa
aa
aa
aa
-ab
+LK
aa
aa
aa
@@ -1459,9 +1462,9 @@ aa
aa
aa
aa
-ab
-ab
-ab
+LK
+LK
+LK
aa
aa
aa
@@ -1500,11 +1503,11 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1541,13 +1544,13 @@ aa
(28,1,1) = {"
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1582,15 +1585,15 @@ aa
"}
(29,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1624,15 +1627,15 @@ aa
"}
(30,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1666,15 +1669,15 @@ aa
"}
(31,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1708,15 +1711,15 @@ aa
"}
(32,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1750,14 +1753,14 @@ aa
"}
(33,1,1) = {"
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1793,12 +1796,12 @@ aa
(34,1,1) = {"
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1836,10 +1839,10 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
+LK
+LK
+LK
+LK
aa
aa
aa
@@ -1879,8 +1882,8 @@ aa
aa
aa
aa
-ab
-ab
+LK
+LK
aa
aa
aa
diff --git a/_maps/map_files/Mining/nsv13/ruins/mining9.dmm b/_maps/map_files/Mining/nsv13/ruins/mining9.dmm
index b52eccf608e..446e0bf69b2 100644
--- a/_maps/map_files/Mining/nsv13/ruins/mining9.dmm
+++ b/_maps/map_files/Mining/nsv13/ruins/mining9.dmm
@@ -170,6 +170,9 @@
/obj/effect/landmark/dropship_entry,
/turf/template_noop,
/area/template_noop)
+"U" = (
+/turf/closed/mineral/random,
+/area/ruin/powered)
(1,1,1) = {"
a
@@ -304,8 +307,8 @@ a
a
a
a
-j
-j
+U
+U
a
a
a
@@ -345,10 +348,10 @@ a
a
a
a
-j
-j
-j
-j
+U
+U
+U
+U
a
a
a
@@ -386,12 +389,12 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
a
a
a
@@ -428,12 +431,12 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
a
a
a
@@ -470,13 +473,13 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -512,13 +515,13 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -555,11 +558,11 @@ a
a
a
a
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
a
a
a
@@ -597,10 +600,10 @@ a
a
a
a
-j
-j
-j
-j
+U
+U
+U
+U
a
a
a
@@ -640,8 +643,8 @@ a
a
a
a
-j
-j
+U
+U
a
a
a
@@ -1210,10 +1213,10 @@ a
a
a
a
-j
-j
-j
-j
+U
+U
+U
+U
a
a
a
@@ -1250,13 +1253,13 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1291,15 +1294,15 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1332,17 +1335,17 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1374,17 +1377,17 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1416,17 +1419,17 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1459,16 +1462,16 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1502,15 +1505,15 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1546,12 +1549,12 @@ a
a
a
a
-j
-j
-j
-j
-j
-j
+U
+U
+U
+U
+U
+U
a
a
a
@@ -1589,10 +1592,10 @@ a
a
a
a
-j
-j
-j
-j
+U
+U
+U
+U
a
a
a
@@ -1633,7 +1636,7 @@ a
a
a
a
-j
+U
a
a
a
diff --git a/_maps/map_files/Serendipity/Serendipity1.dmm b/_maps/map_files/Serendipity/Serendipity1.dmm
index 139581a81b4..bed5e7dbc05 100644
--- a/_maps/map_files/Serendipity/Serendipity1.dmm
+++ b/_maps/map_files/Serendipity/Serendipity1.dmm
@@ -15472,7 +15472,7 @@
/turf/open/floor/plasteel/tiled/light,
/area/bridge/cic)
"YZ" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/camera/autoname{
dir = 4
},
diff --git a/_maps/map_files/Shrike/Shrike1.dmm b/_maps/map_files/Shrike/Shrike1.dmm
index b7fc83f845e..5d11d193318 100644
--- a/_maps/map_files/Shrike/Shrike1.dmm
+++ b/_maps/map_files/Shrike/Shrike1.dmm
@@ -10830,7 +10830,7 @@
lighting_colour_tube = "#c1e1ff"
})
"Wd" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/structure/window/reinforced/spawner/east,
/obj/structure/window/reinforced/spawner/west,
/obj/machinery/door/window{
diff --git a/_maps/map_files/Snake/snake_upper.dmm b/_maps/map_files/Snake/snake_upper.dmm
index 526d1ec8dfc..30174efa977 100644
--- a/_maps/map_files/Snake/snake_upper.dmm
+++ b/_maps/map_files/Snake/snake_upper.dmm
@@ -6409,7 +6409,7 @@
pixel_x = 8;
pixel_y = 24
},
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/structure/extinguisher_cabinet/east,
/turf/open/floor/carpet/red,
/area/crew_quarters/heads/hos)
diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm
index 5ce62ce8fba..5511dae02d0 100644
--- a/_maps/map_files/Tycoon/Tycoon2.dmm
+++ b/_maps/map_files/Tycoon/Tycoon2.dmm
@@ -11320,7 +11320,7 @@
/turf/open/floor/monotile/steel,
/area/crew_quarters/heads/hos)
"aFG" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/machinery/power/apc/auto_name/north{
pixel_y = 24
},
diff --git a/_maps/map_files/Vago/vagodeck1.dmm b/_maps/map_files/Vago/vagodeck1.dmm
index e3d3b1ce0ef..8416589f6cb 100644
--- a/_maps/map_files/Vago/vagodeck1.dmm
+++ b/_maps/map_files/Vago/vagodeck1.dmm
@@ -7226,7 +7226,7 @@
/turf/open/openspace,
/area/hallway/nsv/deck1/frame4/central)
"qP" = (
-/obj/machinery/suit_storage_unit/hos,
+/obj/machinery/suit_storage_unit/peacekeeper,
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 27
},
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index 53416d80c64..cce6b67dbca 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -104,6 +104,9 @@
#define FULL_DIGITIGRADE 1
#define SQUISHED_DIGITIGRADE 2
+
+#define DIGI_ICON_FILE_PASSED (1<<0) //! NSV13 - An accursed flag for update_worn_icon that implies a digi file was passed by the calling proc. This will override other file variables.
+
//! ## flags for covering body parts
#define GLASSESCOVERSEYES (1<<0)
#define MASKCOVERSEYES (1<<1) //! get rid of some of the other stupidity in these flags
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index e0cd1540902..370e4a8dbc4 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -444,6 +444,12 @@
if(BODY_ZONE_R_LEG)
prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
slot_string = "right leg"
+ //NSV13 - If the old limb is digitigrade, so is your prosthetic.
+ if(old_part.bodytype & BODYTYPE_DIGITIGRADE) //This proc seems to trust old part never missing and so will I :)
+ prosthetic.bodytype |= BODYTYPE_DIGITIGRADE
+ prosthetic.static_icon = 'nsv13/icons/mob/augmentation/digitigrade_legs.dmi'
+ prosthetic.limb_id = "digitigrade"
+ //NSV13 end.
prosthetic.replace_limb(H)
qdel(old_part)
H.regenerate_icons()
diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm
index 9613dafc597..74abe7acd49 100644
--- a/code/game/machinery/aug_manipulator.dm
+++ b/code/game/machinery/aug_manipulator.dm
@@ -9,7 +9,7 @@
var/obj/item/bodypart/storedpart
var/initial_icon_state
var/static/list/style_list_icons = list("standard" = 'icons/mob/augmentation/augments.dmi', "engineer" = 'icons/mob/augmentation/augments_engineer.dmi', "security" = 'icons/mob/augmentation/augments_security.dmi', "mining" = 'icons/mob/augmentation/augments_mining.dmi', "veymed female" = 'nsv13/icons/mob/augmentation/veymed.dmi', "veymed male" = 'nsv13/icons/mob/augmentation/veymedm.dmi', "shellguard" = 'nsv13/icons/mob/augmentation/shellguard.dmi', "xion" = 'nsv13/icons/mob/augmentation/xion.dmi', "zeng-hu" = 'nsv13/icons/mob/augmentation/zenghu.dmi', "ward-takahashi" = 'nsv13/icons/mob/augmentation/wardtakahashi.dmi', "bishop" = 'nsv13/icons/mob/augmentation/bishop.dmi') //NSV13 added extra sprites for additional prosthetic looks
-
+ var/static/list/style_list_legs_bonus_icons = list("digitigrade" = 'nsv13/icons/mob/augmentation/digitigrade_legs.dmi') //NSV13 - digitigrade (leg) augmentations WOOOOO
/obj/machinery/aug_manipulator/examine(mob/user)
. = ..()
@@ -102,14 +102,27 @@
add_fingerprint(user)
if(storedpart)
- var/augstyle = input(user, "Select style.", "Augment Custom Fitting") as null|anything in style_list_icons
+ //NSV13 - digitigrade robot leggies
+ var/style_options = style_list_icons
+ if(istype(storedpart, /obj/item/bodypart/r_leg) || istype(storedpart, /obj/item/bodypart/l_leg))
+ style_options += style_list_legs_bonus_icons //Doing this with assoc lists IS actually legal. Very cool. And Yes I know this somewhat reduces the point of using static lists, but this proc is rare.
+ var/augstyle = input(user, "Select style.", "Augment Custom Fitting") as null|anything in style_options
+ //NSV13 end.
if(!augstyle)
return
if(!in_range(src, user))
return
if(!storedpart)
return
- storedpart.static_icon = style_list_icons[augstyle]
+ //NSV13 - digi robot leggies. This is kind of scuffed but the proc gets called rarely enough and this is compact.
+ storedpart.static_icon = style_options[augstyle]
+ if(augstyle == "digitigrade")
+ storedpart.bodytype |= BODYTYPE_DIGITIGRADE
+ storedpart.limb_id = "digitigrade" //Sooo basically limb code is cursed and digitigrade limbs even more so.
+ else
+ storedpart.bodytype &= ~(BODYTYPE_DIGITIGRADE)
+ storedpart.limb_id = "robotic" //Sooo basically augment code is also cursed which means this actually fixes a bug :)
+ //NSV13 end.
eject_part(user)
else
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index d89dd93297c..b6b64a98816 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -246,6 +246,7 @@
if (!can_send_messages_to_other_sectors(usr))
return
if (!COOLDOWN_FINISHED(src, important_action_cooldown))
+ to_chat(usr, "Please stand by, transmitter in cooldown cycle")
return
var/message = trim(html_encode(params["message"]), MAX_MESSAGE_LEN)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 37bf79682ef..d4776194848 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1085,6 +1085,10 @@
note = C
update_icon()
else if(HAS_TRAIT(C, TRAIT_DOOR_PRYER) && user.a_intent != INTENT_HARM)
+ //NSV13 - please don't make jaws of life inferior to crowbars.
+ if(C.tool_behaviour == TOOL_CROWBAR && !security_level && (panel_open && ((obj_flags & EMAGGED) || (density && welded && !operating && !hasPower() && !locked) || charge)))
+ try_to_crowbar(C, user)
+ //NSV13 end
if(isElectrified() && C?.siemens_coefficient)
shock(user,100)
@@ -1180,33 +1184,6 @@
return
INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
- if(HAS_TRAIT(I, TRAIT_DOOR_PRYER)) //NSV13 - kept the ability to use crowbars and stuff on doors
- if(isElectrified())
- shock(user,100)//it's like sticking a forck in a power socket
- return
-
- if(!density)//already open
- return
-
- if(locked)
- to_chat(user, "The bolts are down, it won't budge!")
- return
-
- if(welded)
- to_chat(user, "It's welded, it won't budge!")
- return
-
- var/time_to_open = 5
- if(hasPower() && !prying_so_hard)
- time_to_open = 50
- playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) //is it aliens or just the CE being a dick?
- prying_so_hard = TRUE
- if(do_after(user, time_to_open, TRUE, src))
- open(2)
- if(density && !open(2))
- to_chat(user, "Despite your attempts, [src] refuses to open.")
- prying_so_hard = FALSE
-
/obj/machinery/door/airlock/open(forced=0)
if( operating || welded || locked )
return FALSE
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 68ddb0ce4f6..0af18ab4f0d 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -3,7 +3,7 @@
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmet"
item_state = "helmet"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 30, "bullet" = 40, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
flags_inv = HIDEEARS
cold_protection = HEAD
heat_protection = HEAD
@@ -190,6 +190,7 @@
icon_state = "blueshift"
item_state = "blueshift"
custom_premium_price = 450
+ armor = list("melee" = 50, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 40)
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
@@ -282,7 +283,7 @@
desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
icon_state = "swatsyndie"
item_state = "swatsyndie"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 50, "acid" = 50, "stamina" = 50)
+ armor = list("melee" = 40, "bullet" = 40, "laser" = 30,"energy" = 10, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 50, "acid" = 50, "stamina" = 50)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
@@ -416,7 +417,7 @@
desc = "It can hold a bottle of vodka."
icon_state = "rus_helmet"
item_state = "rus_helmet"
- armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50, "stamina" = 20)
+ armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 5, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50, "stamina" = 20)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/helmet
/obj/item/clothing/head/helmet/rus_ushanka
@@ -427,4 +428,4 @@
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50, "stamina" = 20)
+ armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 5, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50, "stamina" = 20)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index cc964ba156a..c658e7b048a 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -31,7 +31,7 @@
icon_state = "captain"
item_state = "that"
flags_inv = 0
- armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 15, "energy" = 20, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/captain
@@ -48,7 +48,7 @@
name = "head of personnel's cap"
icon_state = "hopcap"
desc = "The symbol of true bureaucratic micromanagement."
- armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
dog_fashion = /datum/dog_fashion/head/hop
//Chaplain
@@ -71,7 +71,7 @@
/obj/item/clothing/head/fedora/det_hat
name = "detective's fedora"
desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat."
- armor = list("melee" = 25, "bullet" = 5, "laser" = 25, "energy" = 30, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50, "stamina" = 25)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50, "stamina" = 25) //NSV13
icon_state = "detective"
var/candy_cooldown = 0
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/detective
@@ -140,7 +140,7 @@
name = "durathread beret"
desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer."
icon_state = "beretdurathread"
- armor = list("melee" = 15, "bullet" = 5, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5, "stamina" = 20)
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5, "stamina" = 20) //NSV13
//Security
@@ -148,7 +148,7 @@
name = "head of security cap"
desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
icon_state = "hoscap"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 30, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60, "stamina" = 30)
+ armor = list("melee" = 40, "bullet" = 50, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60, "stamina" = 30) //NSV13
strip_delay = 80
dynamic_hair_suffix = ""
@@ -169,7 +169,7 @@
name = "warden's police hat"
desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
icon_state = "policehelm"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60, "stamina" = 30)
+ armor = list("melee" = 40, "bullet" = 45, "laser" = 10, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60, "stamina" = 30) //NSV13
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/warden
@@ -246,14 +246,14 @@
name = "corporate warden beret"
desc = "A special black beret with the Warden's insignia in the middle. This one is commonly worn by wardens of the corporation."
icon_state = "beret_corporate_warden"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60, "stamina" = 30)
+ armor = list("melee" = 40, "bullet" = 45, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60, "stamina" = 30) //NSV13
strip_delay = 60
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
icon_state = "beret_badge"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 30, "bullet" = 40, "laser" = 20,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
strip_delay = 60
dog_fashion = null
@@ -261,19 +261,20 @@
name = "corporate security beret"
desc = "A special black beret for the mundane life of a corporate security officer."
icon_state = "beret_corporate_officer"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 35, "bullet" = 40, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50, "stamina" = 30) //NSV13
strip_delay = 60
/obj/item/clothing/head/beret/sec/navyhos
name = "head of security's beret"
desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
icon_state = "hosberet"
+ armor = list("melee" = 30, "bullet" = 50, "laser" = 20,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 40) //NSV13
/obj/item/clothing/head/beret/sec/navywarden
name = "warden's beret"
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "wardenberet"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50, "stamina" = 30)
+ armor = list("melee" = 40, "bullet" = 45, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50, "stamina" = 30) //NSV13
strip_delay = 60
/obj/item/clothing/head/beret/sec/navyofficer
diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm
index 8e0205c8aff..ea28685b304 100644
--- a/code/modules/clothing/outfits/syndicate.dm
+++ b/code/modules/clothing/outfits/syndicate.dm
@@ -19,7 +19,7 @@
suit_store = /obj/item/gun/ballistic/revolver/mateba
glasses = /obj/item/clothing/glasses/thermal/eyepatch
neck = /obj/item/clothing/neck/cloak/syndcap
- shoes = /obj/item/clothing/shoes/combat/swat
+ shoes = /obj/item/clothing/shoes/combat //NSV13 - funny boarding spawn
neck = /obj/item/clothing/neck/cloak/syndcap
backpack_contents = list(/obj/item/uplink/nuclear=1)
@@ -35,5 +35,5 @@
mask = /obj/item/clothing/mask/cigarette/cigar/havana
l_pocket = /obj/item/lighter
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- shoes = /obj/item/clothing/shoes/combat/swat
+ shoes = /obj/item/clothing/shoes/combat //NSV13 - funny boarding spawn
backpack_contents = list(/obj/item/storage/box/survival=1,/obj/item/clipboard=1,/obj/item/ammo_box/shotgun_lethal=3)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 43ce2baed00..7a2ae886d47 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -196,6 +196,7 @@
icon = 'nsv13/icons/obj/clothing/suits.dmi' //NSV13
worn_icon = 'nsv13/icons/mob/suit.dmi' //NSV13
icon_state = "hardsuit-engineering-legacy" //NSV13
+ supports_variations = DIGITIGRADE_VARIATION //NSV13 - legacy sprite has digisprite.
item_state = "eng_hardsuit"
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75, "stamina" = 20)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
@@ -216,6 +217,7 @@
name = "atmospherics hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has thermal shielding."
icon_state = "hardsuit-atmospherics-legacy" //NSV13
+ supports_variations = DIGITIGRADE_VARIATION //NSV13 - legacy sprite has digisprite.
item_state = "atmo_hardsuit"
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 100, "rad" = 25, "fire" = 100, "acid" = 75, "stamina" = 20)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
@@ -236,6 +238,7 @@
/obj/item/clothing/suit/space/hardsuit/engine/elite
icon_state = "hardsuit-white-legacy" //NSV13
+ supports_variations = DIGITIGRADE_VARIATION //NSV13 - legacy sprite has digisprite.
name = "advanced hardsuit"
desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish."
item_state = "ce_hardsuit"
@@ -444,15 +447,19 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
item_flags = ILLEGAL //Syndicate only and difficult to obtain outside of uplink anyway. Nukie hardsuits on the ship are illegal.
+ var/cm_slowdown = 0 //NSV13
actions_types = list(
/datum/action/item_action/toggle_helmet,
/datum/action/item_action/toggle_beacon,
/datum/action/item_action/toggle_beacon_frequency
)
-/obj/item/clothing/suit/space/hardsuit/syndi/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100)
+/obj/item/clothing/suit/space/hardsuit/syndi/ComponentInitialize() //NSV13
+ . = ..()
+ artifact_immunity()
+
+/obj/item/clothing/suit/space/hardsuit/syndi/proc/artifact_immunity() //NSV13
+ AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100)
/obj/item/clothing/suit/space/hardsuit/syndi/ui_action_click(mob/user, datum/actiontype)
switch(actiontype.type)
@@ -513,7 +520,7 @@
/obj/item/clothing/suit/space/hardsuit/syndi/proc/activate_combat_mode()
name = "[initial(name)] (combat)"
desc = alt_desc
- slowdown = 0
+ slowdown = cm_slowdown //NSV13
clothing_flags &= ~STOPSPRESSUREDAMAGE
cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
if(ishuman(loc))
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 23e04b1da5e..518a29cf3ac 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -52,7 +52,7 @@ Contains:
icon_state = "heavy"
item_state = "swat_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
- armor = list("melee" = 40, "bullet" = 45, "laser" = 15,"energy" = 30, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100, "stamina" = 60) //NSV13
+ armor = list("melee" = 40, "bullet" = 50, "laser" = 15,"energy" = 10, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100, "stamina" = 60) //NSV13
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
move_sound = list('sound/effects/suitstep1.ogg', 'sound/effects/suitstep2.ogg')
@@ -64,7 +64,7 @@ Contains:
dynamic_hair_suffix = "+generic"
dynamic_fhair_suffix = "+generic"
flags_inv = 0
- armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 100)
+ armor = list("melee" = 70, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 90) //NSV13
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -79,7 +79,7 @@ Contains:
flags_inv = 0
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
- armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 100)
+ armor = list("melee" = 70, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100, "stamina" = 90) //NSV13
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 869ef14092a..94740ca0fc2 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/suit/armor
allowed = null
- body_parts_covered = CHEST
+ body_parts_covered = CHEST|GROIN // debatable
cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN
@@ -9,7 +9,7 @@
equip_delay_other = 40
max_integrity = 250
resistance_flags = NONE
- armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
+ armor = list("melee" = 30, "bullet" = 50, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
clothing_flags = THICKMATERIAL
/obj/item/clothing/suit/armor/Initialize(mapload)
@@ -39,18 +39,20 @@
/obj/item/clothing/suit/armor/vest/blueshirt
name = "large armor vest"
- desc = "A large, yet comfortable piece of armor, protecting you from some threats. Type H-L"
+ desc = "A large, yet comfortable piece of armor, stitched together by a rioting quartermaster, a gift. Type H-L" //NSV13
icon_state = "blueshift"
item_state = "blueshift"
custom_premium_price = 600
+ armor = list("melee" = 50, "bullet" = 5, "laser" = 5, "energy" = 10, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 40) //NSV13
+ body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/armor/vest/corporate
name = "corporate Jacket"
desc = "A Stylish Corporate Jacket which also provides Protection."
icon_state = "secjacket"
item_state = "secjacket"
- body_parts_covered = CHEST|ARMS
- armor = list("melee" = 25, "bullet" = 25, "laser" = 10, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 45, "acid" = 45, "stamina" = 30) //NSV13
+ body_parts_covered = CHEST|GROIN|ARMS
+ armor = list("melee" = 35, "bullet" = 45, "laser" = 10, "energy" = 30, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 45, "acid" = 45, "stamina" = 30) //NSV13
/obj/item/clothing/suit/armor/hos
name = "armored greatcoat"
@@ -58,7 +60,7 @@
icon_state = "hos"
item_state = "greatcoat"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
- armor = list("melee" = 30, "bullet" = 45, "laser" = 15, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "stamina" = 40) //NSV13
+ armor = list("melee" = 40, "bullet" = 60, "laser" = 15, "energy" = 30, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "stamina" = 40) //NSV13
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
@@ -77,7 +79,7 @@
icon_state = "warden_alt"
item_state = "armor"
body_parts_covered = CHEST|GROIN|ARMS
- armor = list("melee" = 30, "bullet" = 45, "laser" = 15, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "stamina" = 40) //NSV13
+ armor = list("melee" = 30, "bullet" = 55, "laser" = 15, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "stamina" = 40) //NSV13
cold_protection = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
@@ -136,7 +138,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "stamina" = 50)
+ armor = list("melee" = 60, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "stamina" = 50) //NSV13
blocks_shove_knockdown = TRUE
strip_delay = 80
equip_delay_other = 60
@@ -283,7 +285,7 @@
equip_delay_other = 40
max_integrity = 200
resistance_flags = FLAMMABLE
- armor = list("melee" = 20, "bullet" = 20, "laser" = 10, "energy" = 40, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50, "stamina" = 30) //NSV13
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 10, "energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50, "stamina" = 30) //NSV13
/obj/item/clothing/suit/armor/vest/russian
name = "russian vest"
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 439e1b6047d..158382fd550 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -120,13 +120,13 @@
name = "syndicate captain's cloak"
desc = "A cloak that inspires fear among Nanotrasen employees, worn by the greatest Syndicate captains."
icon_state = "syndcapt"
- armor = list("melee" = 10, "bullet" = 10, "laser" = 0, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 70)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 70) //NSV13 - armor stacking clear
/obj/item/clothing/neck/cloak/syndadmiral //NSV13 - syndicate admiral
name = "syndicate admiral's cloak"
desc = "A deep red cloak, worn by only the greatest of the Syndicate. If you are looking at this, you probably won't be looking at it for much longer."
icon_state = "syndadmiral"
- armor = list("melee" = 15, "bullet" = 20, "laser" = 0, "energy" = 40, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //NSV13 - armor stacking clear
/obj/item/clothing/neck/cloak/chap/bishop
name = "bishop's cloak"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index d1f15933c30..b5869b3c3cd 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -354,11 +354,11 @@
/obj/item/clothing/suit/hooded/bee_costume/syndie
name = "BLF costume"
- armor = list("melee" = 20, "bullet" = 20, "laser" = 20,"energy" = 40, "bomb" = 0, "bio" = 60, "rad" = 0, "fire" = 0, "acid" = 50, "stamina" = 40)
+ armor = list("melee" = 30, "bullet" = 50, "laser" = 20,"energy" = 40, "bomb" = 0, "bio" = 60, "rad" = 0, "fire" = 0, "acid" = 50, "stamina" = 30) //NSV13
hoodtype = /obj/item/clothing/head/hooded/bee_hood/syndie
/obj/item/clothing/head/hooded/bee_hood/syndie
- armor = list("melee" = 20, "bullet" = 20, "laser" = 20,"energy" = 40, "bomb" = 0, "bio" = 60, "rad" = 0, "fire" = 0, "acid" = 50, "stamina" = 40)
+ armor = list("melee" = 30, "bullet" = 40, "laser" = 20,"energy" = 40, "bomb" = 0, "bio" = 60, "rad" = 0, "fire" = 0, "acid" = 50, "stamina" = 30) //NSV13
/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
name = "bloated human suit"
@@ -608,7 +608,7 @@
name = "captain's winter coat"
icon_state = "coatcaptain"
item_state = "coatcaptain"
- armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50, "stamina" = 20)
+ armor = list("melee" = 30, "bullet" = 50, "laser" = 20, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "stamina" = 30) //NSV13
hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
/obj/item/clothing/suit/hooded/wintercoat/captain/Initialize(mapload)
@@ -622,7 +622,7 @@
name = "security winter coat"
icon_state = "coatsecurity"
item_state = "coatsecurity"
- armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45, "stamina" = 20)
+ armor = list("melee" = 35, "bullet" = 45, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45, "stamina" = 30) //NSV13
hoodtype = /obj/item/clothing/head/hooded/winterhood/security
/obj/item/clothing/suit/hooded/wintercoat/security/Initialize(mapload)
diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm
index 74d8976c4d8..c7ac27409ac 100644
--- a/code/modules/mob/dead/observer/logout.dm
+++ b/code/modules/mob/dead/observer/logout.dm
@@ -2,7 +2,7 @@
update_z(null)
if (client)
client.images -= (GLOB.ghost_images_default+GLOB.ghost_images_simple)
- client.tgui_panel?.clear_dead_popup()
+ //client.tgui_panel?.clear_dead_popup() - NSV13 - commented out because this is a bad place to do that and also client is commonly already gone when this proc is called.
if(observetarget)
if(ismob(observetarget))
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 8a7fd1487ed..f8a43d4bf67 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -313,6 +313,7 @@ There are several things that need to be remembered:
if(shoes)
var/icon_file = 'icons/mob/clothing/feet.dmi'
+ var/build_worn_icon_override_flags = NONE //NSV13 - variable to pass override flags to build worn icon.
if(istype(shoes, /obj/item/clothing/shoes))
var/obj/item/clothing/shoes/S = shoes
if(S.sprite_sheets & (dna?.species.bodyflag))
@@ -321,13 +322,14 @@ There are several things that need to be remembered:
if(dna?.species.bodytype & BODYTYPE_DIGITIGRADE)
if(S.supports_variations & DIGITIGRADE_VARIATION)
icon_file = 'icons/mob/species/misc/digitigrade_shoes.dmi'
+ build_worn_icon_override_flags |= DIGI_ICON_FILE_PASSED //NSV13 - high priority file.
shoes.screen_loc = ui_shoes //move the item to the appropriate screen loc
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown) //if the inventory is open
client.screen += shoes //add it to client's screen
update_observer_view(shoes,1)
- overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file)
+ overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file, special_override_flags = build_worn_icon_override_flags) //NSV13 - pass special override flags.
var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER]
if(OFFSET_SHOES in dna.species.offset_features)
shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1]
@@ -427,6 +429,7 @@ There are several things that need to be remembered:
if(istype(wear_suit, /obj/item/clothing/suit))
var/icon_file = 'icons/mob/clothing/suit.dmi'
+ var/build_worn_icon_override_flags = NONE //NSV13 - override flags passed to build worn icon.
var/obj/item/clothing/suit/S = wear_suit
if(S.sprite_sheets & (dna?.species.bodyflag))
icon_file = dna.species.get_custom_icons("suit")
@@ -434,6 +437,7 @@ There are several things that need to be remembered:
if(dna?.species.bodytype & BODYTYPE_DIGITIGRADE)
if(S.supports_variations & DIGITIGRADE_VARIATION)
icon_file = 'icons/mob/species/misc/digitigrade_suits.dmi'
+ build_worn_icon_override_flags |= DIGI_ICON_FILE_PASSED //NSV13 - high priority file.
wear_suit.screen_loc = ui_oclothing
if(client && hud_used && hud_used.hud_shown)
@@ -441,7 +445,7 @@ There are several things that need to be remembered:
client.screen += wear_suit
update_observer_view(wear_suit,1)
- overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = icon_file)
+ overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = icon_file, special_override_flags = build_worn_icon_override_flags) //NSV13 - can pass special override flags.
var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]
if(OFFSET_SUIT in dna.species.offset_features)
suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1]
@@ -667,7 +671,7 @@ generate/load female uniform sprites matching all previously decided variables
*/
-/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state = null)
+/obj/item/proc/build_worn_icon(default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, override_state = null, special_override_flags = NONE) //NSV13 - special override flag to help with the mess that is digisprites.
var/t_state
if(override_state)
@@ -676,7 +680,7 @@ generate/load female uniform sprites matching all previously decided variables
t_state = !isinhands ? (worn_icon_state ? worn_icon_state : icon_state) : (item_state ? item_state : icon_state)
//Find a valid icon file from variables+arguments
- var/file2use = !isinhands ? (worn_icon ? worn_icon : default_icon_file) : default_icon_file
+ var/file2use = !isinhands ? ((worn_icon && !(special_override_flags & DIGI_ICON_FILE_PASSED)) ? worn_icon : default_icon_file) : default_icon_file //NSV13 - prioritize digitigrade file over ANY others if it is passed.
//Find a valid layer from variables+arguments
var/layer2use = alternate_worn_layer ? alternate_worn_layer : default_layer
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 44c4712617d..160ecc5c4bc 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -571,6 +571,10 @@
for(var/S in mind.spell_list)
var/obj/effect/proc_holder/spell/spell = S
spell.updateButtonIcon()
+ //NSV13 - clear that popup.
+ if(client)
+ client.tgui_panel?.clear_dead_popup()
+ //NSV13 end.
/mob/living/proc/remove_CC(should_update_mobility = TRUE)
SetStun(0, FALSE)
@@ -1167,7 +1171,18 @@
if(buckled.buckle_lying != -1)
lying = buckled.buckle_lying
if(!lying) //force them on the ground
- lying = pick(90, 270)
+ //NSV13 - you get to choose if it's controlled.
+ if(!resting)
+ lying = pick(90, 270)
+ else
+ switch(dir)
+ if(WEST)
+ lying = 270
+ if(EAST)
+ lying = 90
+ else
+ lying = pick(90, 270)
+ //NSV13 end.
else
mobility_flags |= MOBILITY_STAND
lying = 0
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index c8f1f02c6bc..526ae5579a2 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -30,3 +30,7 @@
var/datum/antagonist/hivemind/hivemind = mind.has_antag_datum(/datum/antagonist/hivemind)
if(hivemind)
hivemind.regain_images()
+ //NSV13 - clear the dead alert.
+ if(stat != DEAD)
+ client?.tgui_panel?.clear_dead_popup()
+ //NSV13 end.
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d57c5e848ca..dc14e5afb96 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -899,7 +899,11 @@
///Force get the ghost from the mind
/mob/proc/grab_ghost(force)
if(mind)
- return mind.grab_ghost(force = force)
+ //NSV13 - clear dead popup if alive.
+ . = mind.grab_ghost(force = force)
+ if(stat != DEAD && client)
+ client.tgui_panel?.clear_dead_popup()
+ //NSV13 end
///Notify a ghost that it's body is being cloned
/mob/proc/notify_ghost_cloning(var/message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", var/sound = 'sound/effects/genetics.ogg', var/atom/source = null, flashwindow)
diff --git a/code/modules/pool/pool.dm b/code/modules/pool/pool.dm
index c8ae9c8606e..eb253ed709b 100644
--- a/code/modules/pool/pool.dm
+++ b/code/modules/pool/pool.dm
@@ -9,7 +9,7 @@ Place a pool filter somewhere in the pool if you want people to be able to modif
*/
/obj/effect/overlay/poolwater
- name = "Pool water"
+ name = "pool water"
icon = 'icons/obj/pool.dmi'
icon_state = "water"
anchored = TRUE
@@ -17,7 +17,7 @@ Place a pool filter somewhere in the pool if you want people to be able to modif
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/turf/open/indestructible/sound/pool
- name = "Swimming pool"
+ name = "swimming pool"
desc = "A fun place where you go to swim! Drag and drop yourself onto it to climb in..."
icon = 'icons/obj/pool.dmi'
icon_state = "pool"
@@ -111,6 +111,22 @@ Place a pool filter somewhere in the pool if you want people to be able to modif
mood_change = -4
timeout = 4 MINUTES
+/turf/open/indestructible/sound/pool/attackby(obj/item/W, mob/user, params)
+ if(..())
+ return
+ if(!istype(W, /obj/item/stack/rods))
+ return
+ if(locate(/obj/structure/pool_ladder) in src)
+ return
+ if(!W.tool_use_check(user,10))
+ return
+ if(!istype(get_step(src,NORTH), /turf/open/indestructible/sound/pool)) //Ladders only face up, and no stacking!
+ balloon_alert(user, "You start installing a pool ladder...")
+ if(do_after(user, 5 SECONDS, target=src))
+ W.use(10)
+ new /obj/structure/pool_ladder(src)
+ return TRUE
+
/turf/open/indestructible/sound/pool/proc/splash(mob/user)
user.forceMove(src)
playsound(src, 'sound/effects/splosh.ogg', 100, 1) //Credit to hippiestation for this sound file!
@@ -162,7 +178,7 @@ Place a pool filter somewhere in the pool if you want people to be able to modif
return TRUE
/obj/effect/turf_decal/pool
- name = "Pool siding"
+ name = "pool siding"
icon = 'icons/obj/pool.dmi'
icon_state = "poolborder"
@@ -175,16 +191,52 @@ Place a pool filter somewhere in the pool if you want people to be able to modif
//Pool machinery
/obj/structure/pool_ladder
- name = "Pool ladder"
- desc = "Click this to get out of a pool quickly."
+ name = "pool ladder"
+ desc = "A faster and safer way to leave the pool."
icon = 'icons/obj/pool.dmi'
icon_state = "ladder"
+ anchored = TRUE
pixel_y = 12
+/obj/structure/pool_ladder/examine(mob/user)
+ . = ..()
+ . += "There are bolts securing it to the side of the pool."
+
+/obj/structure/pool_ladder/wrench_act(mob/living/user, obj/item/I)
+ balloon_alert(user, "You start disassembling [src].")
+ if(I.use_tool(src, user, 5 SECONDS))
+ deconstruct()
+
+/obj/structure/pool_ladder/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/rods/ten(get_turf(src))
+ ..()
+
+/obj/structure/pool_ladder/attack_hand(mob/user)
+ var/datum/component/swimming/S = user.GetComponent(/datum/component/swimming)
+ if(S)
+ to_chat(user, "You start to climb out of the pool...")
+ if(do_after(user, 1 SECONDS, target=src))
+ S.RemoveComponent()
+ visible_message("[user] climbs out of the pool.")
+ user.forceMove(get_turf(get_step(src, NORTH))) //Ladders shouldn't adjoin another pool section. Ever.
+ else
+ to_chat(user, "You start to climb into the pool...")
+ var/turf/T = get_turf(src)
+ if(do_after(user, 1 SECONDS, target=src))
+ if(!istype(T, /turf/open/indestructible/sound/pool)) //Ugh, fine. Whatever.
+ user.forceMove(get_turf(src))
+ else
+ var/turf/open/indestructible/sound/pool/P = T
+ P.splash(user)
+
+/obj/structure/pool_ladder/attack_robot(mob/user)
+ . = ..()
+ attack_hand(user)
+
GLOBAL_LIST_EMPTY(pool_filters)
/obj/machinery/pool_filter
- name = "Pool filter"
+ name = "pool filter"
desc = "A device which can help you regulate conditions in a pool. Use a wrench to change its operating temperature, or hit it with a reagent container to load in new liquid to add to the pool."
icon = 'icons/obj/pool.dmi'
icon_state = "poolfilter"
@@ -272,25 +324,3 @@ GLOBAL_LIST_EMPTY(pool_filters)
C.adjust_bodytemperature(35, 0, 500)
M.adjustFireLoss(2.5 * delta_time)
to_chat(M, "The water is searing hot!")
-
-/obj/structure/pool_ladder/attack_hand(mob/user)
- var/datum/component/swimming/S = user.GetComponent(/datum/component/swimming)
- if(S)
- to_chat(user, "You start to climb out of the pool...")
- if(do_after(user, 1 SECONDS, target=src))
- S.RemoveComponent()
- visible_message("[user] climbs out of the pool.")
- user.forceMove(get_turf(get_step(src, NORTH))) //Ladders shouldn't adjoin another pool section. Ever.
- else
- to_chat(user, "You start to climb into the pool...")
- var/turf/T = get_turf(src)
- if(do_after(user, 1 SECONDS, target=src))
- if(!istype(T, /turf/open/indestructible/sound/pool)) //Ugh, fine. Whatever.
- user.forceMove(get_turf(src))
- else
- var/turf/open/indestructible/sound/pool/P = T
- P.splash(user)
-
-/obj/structure/pool_ladder/attack_robot(mob/user)
- . = ..()
- attack_hand(user)
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 06a03fb4447..d0e487e2f53 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -745,7 +745,7 @@
display_name = "Mining Technology"
description = "Better than Efficiency V."
prereq_ids = list("engineering")
- design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console")
+ design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "hypermod", "plasmacutter", "ore_redemption", "mining_equipment_vendor", "exploration_equipment_vendor", "cargoexpress", "furnace", "furnace_console")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index b92e729398d..2ed52079952 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -93,7 +93,7 @@
if(burn_dam >= DAMAGE_PRECISION)
. += "This limb has [burn_dam > 30 ? "severe" : "minor"] burns."
if(limb_id)
- . += "It is a [limb_id] [parse_zone(body_zone)]."
+ . += "It is a [limb_id][bonus_limb_id_text()] [parse_zone(body_zone)]." //NSV13 - I have to hook in here.
/obj/item/bodypart/blob_act()
take_damage(max_damage)
diff --git a/code/modules/unit_tests/get_overmap.dm b/code/modules/unit_tests/get_overmap.dm
index a4c054e089b..d5098464a95 100644
--- a/code/modules/unit_tests/get_overmap.dm
+++ b/code/modules/unit_tests/get_overmap.dm
@@ -68,31 +68,11 @@
sabre.enter(dummy)
dummy.update_overmap()
TEST_ASSERT_EQUAL(dummy.get_overmap(), sabre, "The mob's overmap was not the sabre")
-*/
-/datum/unit_test/fighter_pilot_overmap/Destroy()
+/datum/unit_test/sabre_occupant_overmap/Destroy()
QDEL_NULL(dummy)
. = ..()
-
-/// A fighter inside a larger ship should have its get_overmap return the ship
-/datum/unit_test/fighter_on_ship
- var/obj/structure/overmap/small_craft/combat/light/fighter = null
-
-/datum/unit_test/fighter_on_ship/Run()
- for(var/obj/structure/overmap/small_craft/combat/light/OM as() in SSstar_system.find_main_overmap().overmaps_in_ship)
- fighter = OM
- break
-
- if(!fighter)
- var/turf/center = SSmapping.get_station_center()
- ASSERT(center)
- fighter = new (center)
-
- TEST_ASSERT_EQUAL(fighter.get_overmap(), SSstar_system.find_main_overmap(), "The fighter's overmap was not the ship")
-
-/datum/unit_test/fighter_on_ship/Destroy()
- QDEL_NULL(fighter)
- . = ..()
+*/
/// A fighter that leaves and re-enters a larger ship should have its get_overmap return null while in space, and the ship when back on the ship
/datum/unit_test/fighter_docking
diff --git a/html/changelog.html b/html/changelog.html
index 2ac7d0c8b06..51da79bf09b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,116 +56,74 @@
-->
-
14 June 2024
+
24 August 2024
DeltaFire15 updated:
- - The AI tracking window no longer breaks if anybody on the camera network is naked.
- - As AI, tracking somebody with the crew monitor should be less likely to brick.
+ - The "You are Dead" chat window popup should now be properly removed when you are not dead.
+ - Broadside cannons should now always fire on the correct side.
+ - Your current direction now decides which way you will face when voluntarily resting.
+ - Jaws of life can now deconstruct doors like a crowbar could.
+ - Cleans up some leftover code that remained after a beebase.
-
benbot16 updated:
+
SerynEngi updated:
- - Air-to-air repair/refuel modules now have a maximum range.
- - Adjusts repair/fuel transfer times for air-to-air modules
- - Air-to-air repair/refuel modules now function properly.
- - Fixes a virtual-z issue with dropships
+ - Added an ore silo to the Atlas
-
covertcorvid updated:
+
riquewright updated:
- - Upped the compiler version and max client version to 515.1607
+ - turf changes
+ - added random ore spawns
+ - pre-beebase objects and turfs
-
31 May 2024
-
DeltaFire15 updated:
+
16 August 2024
+
Kenionatus updated:
- - Slightly improved some ui_acts of Fighters, APNP and APNW.
+ - Auto recall reminders now also get sent during combat
-
Ikalpo updated:
+
Pockets-byte updated:
- - Conveyor switch assemblies keep all their settings, which can be changed using tools
- - Conveyor switch assemblies can get a link from a belt
- - Conveyor switches can be renamed
- - Slow conveyor belts no longer stack with normal ones
- - Slow belts are now yellow
+ - added a rejection message to the comms console
-
benbot16 updated:
+
+
13 July 2024
+
riquewright updated:
- - Ammo racks may now be loaded by attacking them with ammunition
- - Jam SFX now plays on jam instead of on load attempt
- - Fixes a few ammo rack-related edge cases
+ - re-added plasma cutter to mining tech node's item list
+ - added whole 4 letters
-
21 May 2024
-
Haliris, BriggsIDP, Powerfulbacon, TsunamiAnt, PestoVerde322 updated:
+
12 July 2024
+
Bokkiewokkie updated:
- - Added workshop area to brig based on the holodeck code, where prisoners can make donuts or plushes and scan them to get reduced sentences. Adds secure floors and prison grilles to help secure the prison area better. Adds crafting method for plushes to support the prison plushes sweatshop.
- - Added genpop workshops to Hammerhead and Gladius
- - Changed the path of the previous prisoner id used for gulag (now id/gulag). Updated paths of the current holodeck templates to holodeck/recreational to allow for easier subtypes implementation. Removed holographic flag preventing the crafting menu from working.
- - Genpop code and icons moved out of nsv13 folder
+ - Fixed shield sprites leaving doubles when the ship gets hit
-
-
19 May 2024
DeltaFire15 updated:
- - Brooms can no longer bluespace things into space.
- - The gravity generator now has an emag interaction (and a method to fix said interaction).
- - Overmap projectiles should no longer runtime during collisions while in the process of being fired.
- - Explosions no longer try to throw qdeleting objects.
- - The admin ghost checking proc no longer cries if it is passed a non-mob.
- - The ship console references on overmaps now have some slightly more sane reference handling.
+ - Slightly improved ship weapon machinery firing code (this has no gameplay impact)
+ - Non-/overmap overmap objects no longer runtime if newly added to a loaded system.
-
someone543 updated:
+
Kenionatus updated:
- - Galactica dropship hangar tube was made one tile wider, blast doors have been replaced with airlocks, and a tug has been added
- - Galactica dropship can now move from it's starting location
- - Flight leader now has the right icon
+ - projectiles_fx.dm should now be slightly more readable
-
-
17 May 2024
-
itsmeow updated:
+
Pockets-byte updated:
- - Added TGUI-Say (can be disabled in prefs, light theme also in prefs) - Tab to switch channels.
- - Added new TGUI Say keybinds - Y for Radio, L for LOOC (not currently rebindable).
- - Added TGUI input preferences (mostly unused currently).
- - Added glorfing to TGUI-Say - if you get hit hard enough, your message will be cut off with "-OW!!!", "-AUGH!!!", "-GLORF!!" or similar.
- - Added logging to typing indicators.
- - Added OOC Verb "Refresh TGUI".
- - Legacy say hotkey macros (Ctrl+T, Ctrl+O) have been replaced with T and O.
+ - Added solgov variant of the squad vendor
+ - Added new fighter sprite and fighter with shields
+ - Added new fighter weapon and sprite
-
14 May 2024
-
tonty updated:
+
05 July 2024
+
Pockets-byte updated:
- - the FTL navigation console no longer grants hyperspecific telekinesis to people who use it
+ - Added relayed (overmap) laser projectiles for boom
-
03 May 2024
-
Bokkiewokkie updated:
-
- - Fixed fighters not hearing overmap messages from their mothership.
- - Made it clear the Syndicate Crew antag preference is for PVP
-
+
28 June 2024
DeltaFire15 updated:
- - The BSA now goes kaboom when relayed instead of being essentially a ghost NAC shell.
- - The Eclipse no longer spawns a borg module that should never exist outside of mobs.
- - DNA no longer has some super weird code for flavor text, instead copying the one of the source mob.
- - You can no longer stack interactions on walls. This is to prevent a runtime from actions that modify the type of them (deconstruction mainly).
- - Paper no longer runtimes if you do not have a pen in hand (???).
- - Traders no longer do some cursed things to create their trade items, instead using the all-powerful initial().
- - The stormdrive no longer runtimes if it has zero gas in it.
- - Some squad assignment stuff shouldn't try to use a list as datum anymore.
-
-
-
21 April 2024
-
Bokkiewokkie updated:
-
- - Updated the webmap link
-
-
-
19 April 2024
-
KasparoVy updated:
-
- - added more custom prosthetic sprites
+ - Integrity_failure variable settings removed from all overmaps. (This does nothing)
Now entering [name]...
")
OM.relay(null, "[desc]")
- //If we have an audio cue, ensure it doesn't overlap with a fleet's one...
//End the round upon entering O45.
if(system_traits & STARSYSTEM_END_ON_ENTER)
if(OM.role == MAIN_OVERMAP)
@@ -56,6 +55,7 @@
SSblackbox.record_feedback("text", "nsv_endings", 1, "succeeded")
if(!length(audio_cues))
return FALSE
+ //If we have an audio cue, ensure it doesn't overlap with a fleet's one...
for(var/datum/fleet/F as() in fleets)
if(length(F.audio_cues) && F.alignment != OM.faction && !F.federation_check(OM))
return TRUE
diff --git a/nsv13/code/modules/overmap/armour/nano_pump.dm b/nsv13/code/modules/overmap/armour/nano_pump.dm
index a6bb758fdba..79b47edccfd 100644
--- a/nsv13/code/modules/overmap/armour/nano_pump.dm
+++ b/nsv13/code/modules/overmap/armour/nano_pump.dm
@@ -58,7 +58,7 @@
if(stress_shutdown)
. += "The system overload lights are flashing"
-/obj/machinery/armour_plating_nanorepair_pump/process()
+/obj/machinery/armour_plating_nanorepair_pump/process(delta_time)
if(!OM)
OM = get_overmap()
if(online && is_operational && !stress_shutdown)
@@ -71,7 +71,7 @@
var/armour_integrity = (OM.armour_quadrants[quadrant]["current_armour"] / OM.armour_quadrants[quadrant]["max_armour"]) * 100
if(armour_integrity < 15)
armour_integrity = 15
- armour_repair_amount = ((382 * NUM_E **(0.0764 * armour_integrity))/(50 + NUM_E ** (0.0764 * armour_integrity)) ** 2 ) * (apnw.repair_efficiency * (armour_allocation / 100)) * 6 //Don't ask
+ armour_repair_amount = delta_time * ((382 * NUM_E **(0.0764 * armour_integrity))/(50 + NUM_E ** (0.0764 * armour_integrity)) ** 2 ) * (apnw.repair_efficiency * (armour_allocation / 100)) * 3 //Don't ask
if(apnw.repair_resources >= (armour_repair_amount * weight_class))
OM.armour_quadrants[quadrant]["current_armour"] += armour_repair_amount
if(OM.armour_quadrants[quadrant]["current_armour"] > OM.armour_quadrants[quadrant]["max_armour"])
@@ -82,7 +82,7 @@
if(OM.obj_integrity < OM.max_integrity) //Structure Check
if(OM.structure_crit_no_return) //If we have crossed the point of no return, halt repairs
return
- structure_repair_amount = ((2 + (weight_class / 10)) * apnw.repair_efficiency * structure_allocation) / 100
+ structure_repair_amount = delta_time * ((2 + (weight_class / 10)) * apnw.repair_efficiency * structure_allocation) / 200
if(apnw.repair_resources >= (structure_repair_amount * weight_class) * 1.5)
OM.obj_integrity += structure_repair_amount
if(OM.obj_integrity > OM.max_integrity)
diff --git a/nsv13/code/modules/overmap/fighters/_fighters.dm b/nsv13/code/modules/overmap/fighters/_fighters.dm
index 543c4bf5cd7..b44e62bf267 100644
--- a/nsv13/code/modules/overmap/fighters/_fighters.dm
+++ b/nsv13/code/modules/overmap/fighters/_fighters.dm
@@ -403,6 +403,35 @@ Been a mess since 2018, we'll fix it someday (probably)
/obj/item/fighter_component/battery,
/obj/item/fighter_component/primary/cannon)
+/obj/structure/overmap/small_craft/combat/solgov
+ name = "Peregrine class attack fighter"
+ desc = "A Peregrine class attack fighter, solgov's only premiere fighter, mounting minature capital grade phasers and a tiny shield generator."
+ icon = 'nsv13/icons/overmap/new/solgov/playablefighter.dmi'
+ armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 30, "bomb" = 30, "bio" = 100, "rad" = 90, "fire" = 90, "acid" = 80, "overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 10)
+ sprite_size = 32
+ damage_states = FALSE //temp
+ max_integrity = 25 //shields.
+ max_angular_acceleration = 200
+ speed_limit = 10
+ pixel_w = -16
+ pixel_z = -20
+ components = list(/obj/item/fighter_component/fuel_tank,
+ /obj/item/fighter_component/avionics,
+ /obj/item/fighter_component/apu,
+ /obj/item/fighter_component/targeting_sensor,
+ /obj/item/fighter_component/engine,
+ /obj/item/fighter_component/countermeasure_dispenser,
+ /obj/item/fighter_component/oxygenator,
+ /obj/item/fighter_component/canopy,
+ /obj/item/fighter_component/docking_computer,
+ /obj/item/fighter_component/battery,
+ /obj/item/fighter_component/primary/laser) // no armor because >=3, you can still install it though because this thing is made of tissue paper
+
+/obj/structure/overmap/small_craft/combat/solgov/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/overmap_shields, 125, 125, 15) //inital integrity, max integrity, and recharge rate. bound to change most likely
+
+
/obj/structure/overmap/small_craft/escapepod
name = "Escape Pod"
desc = "An escape pod launched from a space faring vessel. It only has very limited thrusters and is thus very slow."
@@ -485,7 +514,9 @@ Been a mess since 2018, we'll fix it someday (probably)
dradis = new dradis_type(src) //Fighters need a way to find their way home.
dradis.linked = src
set_light(4)
- obj_integrity = max_integrity
+ var/obj/structure/overmap/OM = loc.get_overmap()
+ if(OM) //Actually register that we are inside the ship when spawned
+ OM.overmaps_in_ship |= src
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_moved)) //Used to smoothly transition from ship to overmap
var/obj/item/fighter_component/engine/engineGoesLast = null
if(build_components.len)
@@ -506,6 +537,7 @@ Been a mess since 2018, we'll fix it someday (probably)
add_overlay(canopy)
update_visuals()
+
/obj/structure/overmap/small_craft/attackby(obj/item/W, mob/user, params)
if(operators && LAZYFIND(operators, user))
to_chat(user, "You can't reach [src]'s exterior from in here.")
@@ -1466,7 +1498,7 @@ As a rule of thumb, primaries are small guns that take ammo boxes, secondaries a
Utility modules can be either one of these types, just ensure you set its slot to HARDPOINT_SLOT_UTILITY
*/
/obj/item/fighter_component/primary
- name = "\improper Fuck you"
+ name = "\improper primary weapon"
slot = HARDPOINT_SLOT_PRIMARY
fire_mode = FIRE_MODE_ANTI_AIR
var/overmap_select_sound = 'nsv13/sound/effects/ship/pdc_start.ogg'
@@ -1588,8 +1620,55 @@ Utility modules can be either one of these types, just ensure you set its slot t
burst_size = 3
fire_delay = 0.5 SECONDS
+/obj/item/fighter_component/primary/laser
+ name = "Stinger Class Phaser Cannon"
+ icon_state = "lasercannon"
+ weight = 3 //it's a laser. it's light, but the gun is fuckhueg
+ accepted_ammo = null
+ overmap_select_sound = 'nsv13/sound/effects/ship/phaser_adjust.ogg'
+ overmap_firing_sounds = list('nsv13/sound/effects/ship/burst_phaser.ogg', 'nsv13/sound/effects/ship/burst_phaser2.ogg')
+ burst_size = 3
+ fire_delay = 10 SECONDS
+ var/projectile = /obj/item/projectile/beam/laser/phaser
+ var/charge_to_fire = 2000 // this is probably not final. needs to be a good balance between having an actual mainship weapon on a fighter, and firing one shot every minute because one shot depletes your entire battery
+
+/obj/item/fighter_component/primary/laser/get_ammo()
+ var/obj/structure/overmap/small_craft/F = loc
+ if(!istype(F))
+ return FALSE
+ var/obj/item/fighter_component/battery/B = F.loadout.get_slot(HARDPOINT_SLOT_BATTERY)
+ if(!istype(B))
+ return 0
+ return B.charge
+
+/obj/item/fighter_component/primary/laser/get_max_ammo()
+ var/obj/structure/overmap/small_craft/F = loc
+ if(!istype(F))
+ return FALSE
+ var/obj/item/fighter_component/battery/B = F.loadout.get_slot(HARDPOINT_SLOT_BATTERY)
+ if(!istype(B))
+ return 0
+ return B.maxcharge
+
+/obj/item/fighter_component/primary/laser/fire(obj/structure/overmap/target)
+ var/obj/structure/overmap/small_craft/F = loc
+ if(!istype(F))
+ return FALSE
+ var/obj/item/fighter_component/battery/B = F.loadout.get_slot(HARDPOINT_SLOT_BATTERY)
+
+ if(B.charge < charge_to_fire)
+ F.relay('sound/weapons/gun_dry_fire.ogg')
+ return FALSE
+
+ var/datum/ship_weapon/SW = F.weapon_types[fire_mode]
+ SW.default_projectile_type = projectile
+ SW.fire_fx_only(target, lateral = TRUE)
+ B.charge -= charge_to_fire
+ return TRUE
+
+
/obj/item/fighter_component/secondary
- name = "Fuck you"
+ name = "secondary weapon"
slot = HARDPOINT_SLOT_SECONDARY
fire_mode = FIRE_MODE_TORPEDO
var/overmap_firing_sounds = list(
diff --git a/nsv13/code/modules/overmap/fighters/fighters_launcher.dm b/nsv13/code/modules/overmap/fighters/fighters_launcher.dm
index cca65805662..4faa951073e 100644
--- a/nsv13/code/modules/overmap/fighters/fighters_launcher.dm
+++ b/nsv13/code/modules/overmap/fighters/fighters_launcher.dm
@@ -358,7 +358,7 @@
forceMove(T)
if(current_system)
current_system.remove_ship(src, T)
- OM.overmaps_in_ship += src
+ OM.overmaps_in_ship |= src
bound_width = initial(bound_width)
bound_height = initial(bound_height)
DC.docking_mode = FALSE
diff --git a/nsv13/code/modules/overmap/overmap.dm b/nsv13/code/modules/overmap/overmap.dm
index e43a5e7c8f5..96ac015cb01 100644
--- a/nsv13/code/modules/overmap/overmap.dm
+++ b/nsv13/code/modules/overmap/overmap.dm
@@ -43,7 +43,7 @@
// Health, armor, and damage
max_integrity = 300 //Max internal integrity
- integrity_failure = 0
+ integrity_failure = 0 //If you want to use this you will have to implement obj_break() for overmaps aswell as a method to restore functionality if repaired.
var/armour_plates = 0 //You lose max integrity when you lose armour plates.
var/sensor_profile = 0 //A penalty (or, possibly even bonus) to from how far away one can be detected. Affected by things like sending out a active ping, which will make you glow like a christmas tree.
var/cloak_factor = 255 // Min alpha of a ship during cloak. 0-255
@@ -834,14 +834,14 @@ Proc to spool up a new Z-level for a player ship and assign it a treadmill.
to_chat(M, message)
for(var/obj/structure/overmap/O as() in overmaps_in_ship) //Of course they get relayed the same message if they're in the same ship too
if(length(O.mobs_in_ship))
- O.relay(args)
+ O.relay(S,message,loop,channel)
/obj/structure/overmap/proc/stop_relay(channel) //Stops all playing sounds for crewmen on N channel.
for(var/mob/M as() in mobs_in_ship)
M.stop_sound_channel(channel)
for(var/obj/structure/overmap/O as() in overmaps_in_ship) //Of course they get relayed the same message if they're in the same ship too
if(length(O.mobs_in_ship))
- O.stop_relay(args)
+ O.stop_relay(channel)
/obj/structure/overmap/proc/relay_to_nearby(S, message, ignore_self=FALSE, sound_range=20, faction_check=FALSE) //Sends a sound + text message to nearby ships
for(var/obj/structure/overmap/ship as() in GLOB.overmap_objects) //Might be called in hyperspace or by fighters, so shouldn't use a system check.
diff --git a/nsv13/code/modules/overmap/overmap_ghosts.dm b/nsv13/code/modules/overmap/overmap_ghosts.dm
index 56b960f254a..6eda1b70eba 100644
--- a/nsv13/code/modules/overmap/overmap_ghosts.dm
+++ b/nsv13/code/modules/overmap/overmap_ghosts.dm
@@ -118,7 +118,6 @@
forward_maxthrust *= 3.5
backward_maxthrust *= 3.5
side_maxthrust *= 2
- integrity_failure *= 3.5
max_angular_acceleration *= 2
speed_limit *= 2.5
shots_left = 500 //Having 15 max cannon shots isn't fun
diff --git a/nsv13/code/modules/overmap/shieldgen.dm b/nsv13/code/modules/overmap/shieldgen.dm
index d0cd127dd03..55376675734 100644
--- a/nsv13/code/modules/overmap/shieldgen.dm
+++ b/nsv13/code/modules/overmap/shieldgen.dm
@@ -338,31 +338,38 @@
/obj/effect/temp_visual/overmap_shield_hit
name = "Shield hit"
- icon = 'nsv13/icons/overmap/shieldhit.dmi';
+ icon = 'nsv13/icons/overmap/shieldhit.dmi'
icon_state = "shieldhit"
duration = 0.75 SECONDS
layer = ABOVE_MOB_LAYER+0.1
animate_movement = NO_STEPS // Override the inbuilt movement engine to avoid bouncing
- appearance_flags = TILE_BOUND | PIXEL_SCALE
+ vis_flags = VIS_INHERIT_ID
var/obj/structure/overmap/overmap
/obj/effect/temp_visual/overmap_shield_hit/Initialize(mapload, obj/structure/overmap/OM)
. = ..()
//Scale up the shield hit icon to roughly fit the overmap ship that owns us.
- if(!OM)
+ if(!OM || !istype(OM))
+ log_runtime("Shield hit effect was made with no ship!")
return INITIALIZE_HINT_QDEL
- overmap = OM
var/matrix/desired = new()
- var/icon/I = icon(overmap.icon)
+ var/icon/I = icon(OM.icon)
var/resize_x = I.Width()/96
var/resize_y = I.Height()/96
desired.Scale(resize_x,resize_y)
- desired.Turn(overmap.angle)
transform = desired
- overmap.vis_contents += src
+ //Don't even ask, this makes it fit on the ship sprite properly most of the time
+ if(I.Width() <= 48)
+ pixel_x = -24
+ pixel_y = -24
+ else
+ pixel_x += round(I.Width()/16, 1)
+ pixel_y += pixel_x*round(I.Height()/32, 1)
+ OM.overlays.Add(src) //Otherwise it won't animate with the ship nicely
+ overmap = OM
/obj/effect/temp_visual/overmap_shield_hit/Destroy()
- overmap?.vis_contents -= src
+ overmap?.overlays.Remove(src)
overmap = null
return ..()
diff --git a/nsv13/code/modules/overmap/types/miningships.dm b/nsv13/code/modules/overmap/types/miningships.dm
index 5c53c118548..1a229c346ca 100644
--- a/nsv13/code/modules/overmap/types/miningships.dm
+++ b/nsv13/code/modules/overmap/types/miningships.dm
@@ -10,7 +10,6 @@
sprite_size = 48
damage_states = TRUE
max_integrity = 800 //Max health
- integrity_failure = 800
bound_height = 96
bound_width = 96
armor = list("overmap_light" = 90, "overmap_medium" = 40, "overmap_heavy" = 15)
@@ -22,7 +21,6 @@
role = MAIN_MINING_SHIP
area_type = /area/nostromo
max_integrity = 500 //Max health
- integrity_failure = 500
use_armour_quadrants = FALSE //They can weld plates for now, mining ship will not have a reasonable way to power the pumps -K
starting_system = "Staging" //TEMP UNTIL DELETE
@@ -31,7 +29,6 @@
role = MAIN_MINING_SHIP
area_type = /area/nostromo
max_integrity = 500 //Max health
- integrity_failure = 500
use_armour_quadrants = FALSE //They can weld plates for now, mining ship will not have a reasonable way to power the pumps -K
starting_system = "Staging" //TEMP UNTIL DELETE
/obj/structure/overmap/nanotrasen/mining_cruiser/nostromo/fob
@@ -40,7 +37,6 @@
area_type = /area/nsv/shuttle
armor = list("overmap_light" = 90, "overmap_medium" = 20, "overmap_heavy" = 0)
max_integrity = 400 //Max health
- integrity_failure = 400
use_armour_quadrants = FALSE //They can weld plates for now, mining ship will not have a reasonable way to power the pumps -K
/obj/structure/overmap/nanotrasen/mining_cruiser/rig
@@ -49,5 +45,4 @@
area_type = /area/nostromo
starting_system = "Lalande 21185"
max_integrity = 500 //Max health
- integrity_failure = 500
use_armour_quadrants = FALSE //They can weld plates for now, mining ship will not have a reasonable way to power the pumps -K
diff --git a/nsv13/code/modules/overmap/types/nanotrasen.dm b/nsv13/code/modules/overmap/types/nanotrasen.dm
index e50f2039038..9d3ca87896c 100644
--- a/nsv13/code/modules/overmap/types/nanotrasen.dm
+++ b/nsv13/code/modules/overmap/types/nanotrasen.dm
@@ -29,7 +29,6 @@
bound_width = 32
obj_integrity = 300
max_integrity = 300
- integrity_failure = 300
armor = list("overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
@@ -41,7 +40,6 @@
sprite_size = 48
obj_integrity = 450
max_integrity = 450
- integrity_failure = 450
bound_height = 96
bound_width = 96
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
@@ -57,7 +55,6 @@
//pixel_w = -96
obj_integrity = 500
max_integrity = 500
- integrity_failure = 500
//collision_positions = list(new /datum/vector2d(-13,71), new /datum/vector2d(-25,52), new /datum/vector2d(-24,-25), new /datum/vector2d(-11,-66), new /datum/vector2d(4,-69), new /datum/vector2d(15,-28), new /datum/vector2d(15,38), new /datum/vector2d(6,61))
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
@@ -72,7 +69,6 @@
//pixel_w = -32
obj_integrity = 800
max_integrity = 800
- integrity_failure = 800
bound_height = 96
bound_width = 96
armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
@@ -89,7 +85,6 @@
bound_height = 192
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
/obj/structure/overmap/nanotrasen/carrier
@@ -104,7 +99,6 @@
damage_states = FALSE //TODO
obj_integrity = 700
max_integrity = 700
- integrity_failure = 700
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
/obj/structure/overmap/nanotrasen/battlecruiser
@@ -118,7 +112,6 @@
//pixel_w = -32
obj_integrity = 1000
max_integrity = 1000 //Max health
- integrity_failure = 1000
bound_height = 96
bound_width = 96
armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
@@ -135,7 +128,6 @@
damage_states = FALSE //I'm lazy
obj_integrity = 1200
max_integrity = 1200 //Max health
- integrity_failure = 1200
armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 10)
bound_height = 320
bound_width = 320
@@ -152,18 +144,14 @@
icon = 'nsv13/icons/overmap/new/nanotrasen/serendipity.dmi'
icon_state = "serendipity"
mass = MASS_SMALL
- obj_integrity = 500
- max_integrity = 500
- integrity_failure = 500
sprite_size = 48
damage_states = FALSE
bound_height = 32
bound_width = 32
obj_integrity = 1250
max_integrity = 1250
- integrity_failure = 1250
armor = list("overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
- plasma_caster = TRUE
+ plasma_caster = TRUE //One day we'll assign these a smarter way..
//Player Versions
// deletion_behavior = DAMAGE_STARTS_COUNTDOWN
@@ -172,7 +160,6 @@
role = MAIN_OVERMAP
obj_integrity = 1400
max_integrity = 1400 //Max health
- integrity_failure = 1400
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -187,18 +174,16 @@
/obj/structure/overmap/nanotrasen/frigate/starter //Currently assigned to Jeppison and Atlas
role = MAIN_OVERMAP
- obj_integrity = 1000
- max_integrity = 1000
- integrity_failure = 1000
+ obj_integrity = 800
+ max_integrity = 800
starting_system = "Staging" //Required for all player ships
- armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
+ armor = list("overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 10)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
/obj/structure/overmap/nanotrasen/patrol_cruiser/starter //Currently assigned to the Snake
role = MAIN_OVERMAP
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
bound_width = 64
bound_height = 64
starting_system = "Staging" //Required for all player ships
@@ -212,7 +197,6 @@
role = MAIN_OVERMAP
obj_integrity = 1400
max_integrity = 1400
- integrity_failure = 1400
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -228,7 +212,6 @@
role = MAIN_OVERMAP
obj_integrity = 2000
max_integrity = 2000
- integrity_failure = 2000
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 65, "overmap_heavy" = 20)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -237,7 +220,6 @@
role = MAIN_OVERMAP
obj_integrity = 1400
max_integrity = 1400
- integrity_failure = 1400
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 60, "overmap_heavy" = 20)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -246,7 +228,6 @@
role = MAIN_OVERMAP //Player controlled variant
obj_integrity = 2150
max_integrity = 2150
- integrity_failure = 2150
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 25)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -255,7 +236,6 @@
role = MAIN_OVERMAP
obj_integrity = 1200
max_integrity = 1200
- integrity_failure = 1200
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 95, "overmap_medium" = 50, "overmap_heavy" = 10)
overmap_deletion_traits = DAMAGE_STARTS_COUNTDOWN
@@ -287,7 +267,6 @@
ai_behaviour = AI_AGGRESSIVE
obj_integrity = 450
max_integrity = 450 //Max health
- integrity_failure = 450
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
ai_flags = AI_FLAG_BATTLESHIP | AI_FLAG_DESTROYER
combat_dice_type = /datum/combat_dice/destroyer
@@ -297,7 +276,6 @@
ai_behaviour = AI_AGGRESSIVE
obj_integrity = 800
max_integrity = 800 //Max health
- integrity_failure = 800
armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
ai_flags = AI_FLAG_BATTLESHIP
combat_dice_type = /datum/combat_dice/cruiser
@@ -305,7 +283,6 @@
/obj/structure/overmap/nanotrasen/battleship/ai
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
armor = list("overmap_light" = 95, "overmap_medium" = 75, "overmap_heavy" = 50)
ai_controlled = TRUE
ai_flags = AI_FLAG_BATTLESHIP
@@ -318,7 +295,6 @@
missiles = 10
obj_integrity = 500
max_integrity = 500
- integrity_failure = 500
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
combat_dice_type = /datum/combat_dice/cruiser
@@ -327,7 +303,6 @@
ai_flags = AI_FLAG_BATTLESHIP
obj_integrity = 450
max_integrity = 450
- integrity_failure = 450
armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 30)
combat_dice_type = /datum/combat_dice/cruiser
@@ -340,7 +315,6 @@
ai_flags = AI_FLAG_SUPPLY
obj_integrity = 700
max_integrity = 700
- integrity_failure = 700
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
combat_dice_type = /datum/combat_dice/carrier
@@ -368,7 +342,6 @@
armor = list("overmap_light" = 5, "overmap_medium" = 0, "overmap_heavy" = 90)
obj_integrity = 75
max_integrity = 75 //Super squishy!
- integrity_failure = 75
ai_flags = AI_FLAG_SWARMER
bound_width = 32 //Change this on a per ship basis
bound_height = 32
diff --git a/nsv13/code/modules/overmap/types/solgov.dm b/nsv13/code/modules/overmap/types/solgov.dm
index f3800d995d5..76689451ebb 100644
--- a/nsv13/code/modules/overmap/types/solgov.dm
+++ b/nsv13/code/modules/overmap/types/solgov.dm
@@ -14,7 +14,6 @@
bound_height = 96
obj_integrity = 500
max_integrity = 500
- integrity_failure = 500
armor = list("overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
/obj/structure/overmap/nanotrasen/solgov/carrier
@@ -28,7 +27,6 @@
//Tanky
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 20)
/obj/structure/overmap/nanotrasen/solgov/aetherwhisp
@@ -43,7 +41,6 @@
bound_width = 128
obj_integrity = 750
max_integrity = 750
- integrity_failure = 750
armor = list("overmap_light" = 90, "overmap_medium" = 50, "overmap_heavy" = 25)
//Player Versions
@@ -51,8 +48,8 @@
/obj/structure/overmap/nanotrasen/solgov/aetherwhisp/starter
icon = 'nsv13/icons/overmap/nanotrasen/aetherwhisp.dmi'
role = MAIN_OVERMAP
+ obj_integrity = 750
max_integrity = 750 //She's fragile and relies heavily on shields.
- integrity_failure = 750
starting_system = "Staging" //Required for all player ships
armor = list("overmap_light" = 99, "overmap_medium" = 50, "overmap_heavy" = 25)
@@ -72,7 +69,6 @@
desc = "A SolGov pursuit craft, meant for tracking and cornering high value targets."
obj_integrity = 1200
max_integrity = 1200
- integrity_failure = 1200
ai_flags = AI_FLAG_BATTLESHIP | AI_FLAG_DESTROYER | AI_FLAG_ELITE
max_tracking_range = 70
flak_battery_amount = 2
@@ -106,7 +102,6 @@
brakes = FALSE
obj_integrity = 125
max_integrity = 125 //Super squishy!
- integrity_failure = 125
sprite_size = 32
mass = MASS_TINY
bound_width = 32 //Change this on a per ship basis
diff --git a/nsv13/code/modules/overmap/types/spacepirates.dm b/nsv13/code/modules/overmap/types/spacepirates.dm
index d7ff42076f6..4d1974505c7 100644
--- a/nsv13/code/modules/overmap/types/spacepirates.dm
+++ b/nsv13/code/modules/overmap/types/spacepirates.dm
@@ -11,7 +11,6 @@
damage_states = FALSE
obj_integrity = 1200
max_integrity = 1200
- integrity_failure = 1200
starting_system = "Staging"
armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
bound_height = 32
@@ -33,7 +32,6 @@
faction = "pirate"
mass = MASS_SMALL
max_integrity = 400
- integrity_failure = 400
armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
bound_height = 64
bound_width = 64
@@ -109,7 +107,6 @@
bound_width = 96
obj_integrity = 525
max_integrity = 525
- integrity_failure = 525
armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
ai_flags = AI_FLAG_DESTROYER
torpedoes = 30
@@ -130,7 +127,6 @@
bound_height = 128
bound_width = 128
max_integrity = 350
- integrity_failure = 350
shots_left = 20
armor = list("overmap_light" = 80, "overmap_medium" = 45, "overmap_heavy" = 10)
ai_flags = AI_FLAG_BATTLESHIP | AI_FLAG_ELITE //Needs to be shooting all its guns
@@ -159,7 +155,6 @@
bound_height = 160
obj_integrity = 5000
max_integrity = 5000
- integrity_failure = 5000
shots_left = 35
torpedoes = 35
armor = list("overmap_light" = 95, "overmap_medium" = 80, "overmap_heavy" = 45)
diff --git a/nsv13/code/modules/overmap/types/syndicate.dm b/nsv13/code/modules/overmap/types/syndicate.dm
index 241669192f7..2e9e7b7b1df 100644
--- a/nsv13/code/modules/overmap/types/syndicate.dm
+++ b/nsv13/code/modules/overmap/types/syndicate.dm
@@ -22,7 +22,6 @@
damage_states = FALSE
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
ai_controlled = FALSE
//collision_positions = list(new /datum/vector2d(-27,62), new /datum/vector2d(-30,52), new /datum/vector2d(-30,11), new /datum/vector2d(-32,-16), new /datum/vector2d(-30,-45), new /datum/vector2d(-24,-58), new /datum/vector2d(19,-60), new /datum/vector2d(33,-49), new /datum/vector2d(35,24), new /datum/vector2d(33,60))
bound_width = 128
@@ -60,7 +59,6 @@
pixel_w = -96
obj_integrity = 1100
max_integrity = 1100 //Max health
- integrity_failure = 1100
role = PVP_SHIP
armor = list("overmap_light" = 99, "overmap_medium" = 55, "overmap_heavy" = 30)
@@ -99,7 +97,6 @@
damage_states = FALSE
obj_integrity = 300
max_integrity = 300
- integrity_failure = 300
area_type = /area/ruin/powered/nsv13/gunship
var/bounty = 1000
armor = list("overmap_light" = 30, "overmap_medium" = 20, "overmap_heavy" = 30)
@@ -119,7 +116,6 @@
ai_fighter_type = list(/obj/structure/overmap/syndicate/ai/fighter)
obj_integrity = 400
max_integrity = 400
- integrity_failure = 400
armor = list("overmap_light" = 30, "overmap_medium" = 30, "overmap_heavy" = 30)
combat_dice_type = /datum/combat_dice/carrier
possible_interior_maps = list(/datum/map_template/boarding/mako_carrier)
@@ -144,7 +140,6 @@
torpedo_type = /obj/item/projectile/guided_munition/torpedo/hellfire
obj_integrity = 900
max_integrity = 900 //Max health
- integrity_failure = 900
shots_left = 7
torpedoes = 5
missiles = 10
@@ -160,7 +155,6 @@
missiles = 15
obj_integrity = 1200
max_integrity = 1200 //Max health
- integrity_failure = 1200
bounty = 15000
armor = list("overmap_light" = 90, "overmap_medium" = 75, "overmap_light" = 50)
ai_flags = AI_FLAG_DESTROYER | AI_FLAG_ELITE
@@ -179,7 +173,6 @@
mass = MASS_MEDIUM
obj_integrity = 500
max_integrity = 500
- integrity_failure = 500
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
missiles = 6
bounty = 1000
@@ -191,7 +184,6 @@
icon_state = "hammerhead_elite"
obj_integrity = 900
max_integrity = 900
- integrity_failure = 900
armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 40)
missiles = 8
torpedoes = 4
@@ -208,7 +200,6 @@
torpedoes = 0
obj_integrity = 450
max_integrity = 450
- integrity_failure = 450
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 20)
combat_dice_type = /datum/combat_dice/destroyer/flycatcher
@@ -222,7 +213,6 @@
armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 30)
obj_integrity = 450
max_integrity = 450
- integrity_failure = 450
bounty = 3000
ai_flags = AI_FLAG_BATTLESHIP
combat_dice_type = /datum/combat_dice/cruiser
@@ -234,7 +224,6 @@
armor = list("overmap_light" = 90, "overmap_medium" = 70, "overmap_heavy" = 30)
obj_integrity = 1000
max_integrity = 1000
- integrity_failure = 1000
missiles = 10
bounty = 4000
ai_flags = AI_FLAG_BATTLESHIP | AI_FLAG_ELITE
@@ -256,7 +245,6 @@
bound_width = 128
obj_integrity = 600
max_integrity = 600 //Tanky so that it can survive to deploy multiple fighter waves.
- integrity_failure = 600
bounty = 3000
torpedoes = 0
armor = list("overmap_light" = 90, "overmap_medium" = 60, "overmap_heavy" = 10)
@@ -271,7 +259,6 @@
bounty = 5000
obj_integrity = 1400
max_integrity = 1400 //Tanky so that it can survive to deploy multiple fighter waves.
- integrity_failure = 1400
armor = list("overmap_light" = 80, "overmap_medium" = 70, "overmap_heavy" = 25)
//This scary one can launch bombers, which absolutely wreak havoc
ai_fighter_type = list(/obj/structure/overmap/syndicate/ai/fighter,
@@ -298,7 +285,6 @@
damage_states = TRUE
obj_integrity = 5000
max_integrity = 5000 //Max health
- integrity_failure = 5000
bounty = 20000
shots_left = 500 //A monster.
bound_width = 640
@@ -325,7 +311,6 @@
damage_states = FALSE
obj_integrity = 800
max_integrity = 800 //Max health
- integrity_failure = 800
missiles = 0
torpedoes = 0
armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_heavy" = 30)
@@ -359,7 +344,6 @@
damage_states = FALSE
obj_integrity = 750
max_integrity = 750
- integrity_failure = 750
armor = list("overmap_light" = 90, "overmap_medium" = 80, "overmap_light" = 30)
combat_dice_type = /datum/combat_dice/destroyer/flycatcher //Cruiser subtype, called frigate? Guess it gets the combat dice inbetween both.
possible_interior_maps = list(/datum/map_template/boarding/boarding_frigate)
@@ -384,7 +368,6 @@
bound_height = 160
obj_integrity = 450
max_integrity = 450 //Max health
- integrity_failure = 450
missiles = 5
shots_left = 5
torpedoes = 0
@@ -413,7 +396,6 @@
max_integrity = 500 //Max health
bound_height = 128
bound_width = 128
- integrity_failure = 500
missiles = 10
torpedoes = 10 //Torp boat!
shots_left = 10
@@ -441,7 +423,6 @@
desc = "An experimental Syndicate cruiser capable of projecting energy bursts powerful enough to disrupt drive systems."
obj_integrity = 1200 //Pretty thick hull due to it being a priority target
max_integrity = 1200
- integrity_failure = 1200
icon = 'nsv13/icons/overmap/syndicate/syn_light_cruiser.dmi'
icon_state = "advanced_cruiser"
damage_states = FALSE //Maybe later
@@ -489,7 +470,6 @@
max_weapon_range = 85
obj_integrity = 5000
max_integrity = 5000
- integrity_failure = 5000
speed_limit = 16
flak_battery_amount = 3
max_tracking_range = 90
@@ -526,7 +506,6 @@
bound_height = 128
obj_integrity = 4750
max_integrity = 4750
- integrity_failure = 4750
cloak_factor = 100
shots_left = 350
torpedoes = 60
@@ -564,7 +543,6 @@
armor = list("overmap_light" = 10, "overmap_medium" = 5, "overmap_heavy" = 95)
obj_integrity = 115
max_integrity = 115 //Slightly less squishy!
- integrity_failure = 115
ai_flags = AI_FLAG_SWARMER
bound_width = 32
bound_height = 32
@@ -587,7 +565,6 @@
brakes = FALSE
obj_integrity = 75
max_integrity = 75 //Super squishy!
- integrity_failure = 75
sprite_size = 32
faction = "syndicate"
mass = MASS_TINY
@@ -614,7 +591,6 @@
brakes = FALSE
obj_integrity = 100
max_integrity = 100
- integrity_failure = 100
sprite_size = 32
faction = "syndicate"
mass = MASS_TINY
diff --git a/nsv13/code/modules/overmap/weapons/damage.dm b/nsv13/code/modules/overmap/weapons/damage.dm
index 1bcd3fa46b1..ca785286b9d 100644
--- a/nsv13/code/modules/overmap/weapons/damage.dm
+++ b/nsv13/code/modules/overmap/weapons/damage.dm
@@ -23,7 +23,7 @@ Bullet reactions
if(shield_result)
var/damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
if(!impact_sound_cooldown)
- new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
+ new /obj/effect/temp_visual/overmap_shield_hit(src, src)
relay(damage_sound)
if(P.damage >= 15) //Flak begone
shake_everyone(5)
@@ -268,5 +268,5 @@ Bullet reactions
/obj/effect/temp_visual/explosion_telegraph/Destroy()
var/turf/T = get_turf(src)
var/damage_level = ((damage_amount <= 20) ? 1 : ((damage_amount <= 75) ? 2 : ((damage_amount <= 150) ? 3 : 4)))
- explosion(T,damage_level == 4 ? 0 : 2,round(damage_level*1.75),round(damage_level*2.25))
+ explosion(T,damage_level == 4 ? 2 : 0,round(damage_level*1.75),round(damage_level*2.25))
return ..()
diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
index 011f39e1d7c..10e23391736 100644
--- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
+++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
@@ -3,6 +3,9 @@
/obj/item/projectile/proc/spec_overmap_hit(obj/structure/overmap/target)
return
+/obj/item/projectile/bullet/proc/stop_homing()
+ homing = FALSE
+
/**
Misc projectile types, effects, think of this as the special FX file.
@@ -22,7 +25,7 @@ Misc projectile types, effects, think of this as the special FX file.
flag = "overmap_heavy"
spread = 5
-/obj/item/projectile/bullet/mac_relayed_round //Projectile relayed by all default MAC shells on overmap hit. No difference for AP / others as their values don't really matter on z level.
+/obj/item/projectile/bullet/mac_relayed_round //!Projectile relayed by all default MAC shells on overmap hit. No difference for AP / others as their values don't really matter on z level.
icon = 'nsv13/icons/obj/projectiles_nsv.dmi'
icon_state = "railgun"
name = "artillery round"
@@ -66,9 +69,6 @@ Misc projectile types, effects, think of this as the special FX file.
else
addtimer(CALLBACK(src, PROC_REF(stop_homing)), 0.2 SECONDS) //Because all deck guns apparently have slight homing.
-/obj/item/projectile/bullet/proc/stop_homing()
- homing = FALSE
-
/obj/item/projectile/bullet/mac_round/ap
damage = 250
armour_penetration = 70
@@ -82,32 +82,32 @@ Misc projectile types, effects, think of this as the special FX file.
homing_benefit_time = 2.5 SECONDS
homing_turn_speed = 30
-//Improvised ammunition, does terrible damage but is cheap to produce
+///Improvised ammunition, does terrible damage but is cheap to produce
/obj/item/projectile/bullet/mac_round/cannonshot
name = "cannonball"
damage = 350
icon_state = "cannonshot"
flag = "overmap_medium"
-//You somehow loaded a magic entrapment ball into a cannon. This is your reward.
+///You somehow loaded a magic entrapment ball into a cannon. This is your reward.
/obj/item/projectile/bullet/mac_round/cannonshot/admin
damage = 600
speed = 3
flag = "overmap_heavy"
-#define DIRTY_SHELL_TURF_SLUDGE_PROB 70 //Chance for sludge to spawn on a turf within the sludge range of the detonation turf. Detonation turf always gets an epicenter sludge.
-#define DIRTY_SHELL_SLUDGE_RANGE 3 //Un-random sludge event radius (for the shell detonating)
-#define DIRTY_SHELL_PELLET_PROB 80 //Chance for a pellet per tile from the outer circle
-#define DIRTY_SHELL_PELLET_RANGE 6 //Picks all turfs on the other circle of this range and uses them as possible targets for pellets.
+#define DIRTY_SHELL_TURF_SLUDGE_PROB 70 //!Chance for sludge to spawn on a turf within the sludge range of the detonation turf. Detonation turf always gets an epicenter sludge.
+#define DIRTY_SHELL_SLUDGE_RANGE 3 //!Un-random sludge event radius (for the shell detonating)
+#define DIRTY_SHELL_PELLET_PROB 80 //!Chance for a pellet per tile from the outer circle
+#define DIRTY_SHELL_PELLET_RANGE 6 //!Picks all turfs on the other circle of this range and uses them as possible targets for pellets.
-//Dirty shell: Stage 1 - overmap projectile
+///Dirty shell: Stage 1 - overmap projectile
/obj/item/projectile/bullet/mac_round/dirty
damage = 150
name = "dirty artillery round"
relay_projectile_type = /obj/item/projectile/bullet/delayed_prime/dirty_shell_stage_two
-//Delayed priming projectile parent type - useful for a few different kinds of projectiles so why not.
+///Delayed priming projectile parent type - useful for a few different kinds of projectiles so why not.
/obj/item/projectile/bullet/delayed_prime
icon = 'nsv13/icons/obj/projectiles_nsv.dmi'
icon_state = "railgun"
@@ -117,7 +117,7 @@ Misc projectile types, effects, think of this as the special FX file.
movement_type = FLYING
projectile_piercing = ALL
damage = 45 //It's on a z now, lets not instakill people / objects this happens to hit.
- var/penetration_fuze = 1 //Will pen through this many things considered valid for reducing this before arming. Can overpenetrate if it happens to pen through windows or other things with not enough resistance.
+ var/penetration_fuze = 1 //!Will pen through this many things considered valid for reducing this before arming. Can overpenetrate if it happens to pen through windows or other things with not enough resistance.
/obj/item/projectile/bullet/delayed_prime/on_hit(atom/target, blocked)
. = ..()
@@ -140,7 +140,7 @@ Misc projectile types, effects, think of this as the special FX file.
/obj/item/projectile/bullet/delayed_prime/proc/release_payload(atom/detonation_location)
return
-//Dirty shell: Stage 2 - z level sludge payload projectile
+///Dirty shell: Stage 2 - z level sludge payload projectile
/obj/item/projectile/bullet/delayed_prime/dirty_shell_stage_two
name = "dirty artillery round"
icon_state = "railgun"
@@ -186,7 +186,7 @@ Misc projectile types, effects, think of this as the special FX file.
P.fire()
-//Dirty Shell: Stage 3 - spread of irradiating pellets
+///Dirty Shell: Stage 3 - spread of irradiating pellets
/obj/item/projectile/energy/nuclear_particle/dirty_shell_stage_three
irradiate = 300 //Less radiation than the "true" gumballs
name = "irradiated pellet"
@@ -352,6 +352,53 @@ Misc projectile types, effects, think of this as the special FX file.
can_home = TRUE
armor = list("overmap_light" = 10, "overmap_medium" = 0, "overmap_heavy" = 0)
+/obj/item/projectile/guided_munition/Initialize(mapload)
+ . = ..()
+ addtimer(CALLBACK(src, PROC_REF(windup)), 1 SECONDS)
+
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/item/projectile/guided_munition/proc/windup()
+ valid_angle = 360 //Torpedoes "wind up" to hit their target
+ homing_turn_speed *= 5
+ homing_turn_speed = CLAMP(homing_turn_speed, 0, 360)
+ sleep(clearance_time) //Let it get clear of the sender.
+ valid_angle = initial(valid_angle)
+ homing_turn_speed = initial(homing_turn_speed)
+
+//Corvid or someone please refactor this to be less messy.
+/obj/item/projectile/guided_munition/on_hit(atom/target, blocked = FALSE)
+ ..()
+ if(!check_faction(target))
+ return FALSE //Faction checking for overmaps. We're gonna just cut off real early and save some math if the IFF doesn't check out.
+ if(isovermap(target)) //Were we to explode on an actual overmap, this would oneshot the ship as it's a powerful explosion.
+ return BULLET_ACT_HIT
+ var/obj/item/projectile/P = target //This is hacky, refactor check_faction to unify both of these. I'm bodging it for now.
+ if(isprojectile(target) && P.faction != faction && !P.nodamage) //Because we could be in the same faction and collide with another bullet. Let's not blow ourselves up ok?
+ if(obj_integrity <= P.damage) //Tank the hit, take some damage
+ qdel(P)
+ explode()
+ return BULLET_ACT_HIT
+ else
+ take_damage(P.damage)
+ qdel(P)
+ return FALSE //Didn't take the hit
+ if(!isprojectile(target)) //This is lazy as shit but is necessary to prevent explosions triggering on the overmap when two bullets collide. Fix this shit please.
+ detonate(target)
+ else
+ return FALSE
+ return BULLET_ACT_HIT
+
+/obj/item/projectile/guided_munition/bullet_act(obj/item/projectile/P)
+ . = ..()
+ on_hit(P)
+
+/obj/item/projectile/guided_munition/proc/detonate(atom/target)
+ explosion(target, 2, 4, 4)
+
/obj/item/projectile/guided_munition/torpedo
icon_state = "torpedo"
name = "plasma torpedo"
@@ -402,6 +449,13 @@ Misc projectile types, effects, think of this as the special FX file.
/obj/item/projectile/guided_munition/torpedo/hellfire/player_version
damage = 300 //A bit less initial damage to compensate for the /guaranteed/ hellburn effect dealing hefty damage.
+/obj/item/projectile/guided_munition/torpedo/hellfire/spec_overmap_hit(obj/structure/overmap/target)
+ if(length(target.occupying_levels))
+ return //Ship with internal zs, let them burn
+ if(target.ai_controlled || istype(target, /obj/structure/overmap/small_craft))
+ target.hullburn += 60 //hullburn DoT for AIs. Player Fighters get it too, did you expect to just eat one of these?
+ target.hullburn_power = max(target.hullburn_power, 6)
+
/obj/item/projectile/guided_munition/torpedo/plushtide
name = "emotional support torpedo"
damage = 0
@@ -423,81 +477,12 @@ Misc projectile types, effects, think of this as the special FX file.
var/ai_disruption = 30
var/ai_disruption_cap = 120
-//Player-accessible version of the above. Weaker because reverse engineered ~~and balance~~
+///Player-accessible version of parent. Weaker because reverse engineered ~~and balance~~
/obj/item/projectile/guided_munition/torpedo/disruptor/prototype
name = "prototype disruption torpedo"
ai_disruption = 15 //Do you like stuncombat? Well the AI doesn't.
ai_disruption_cap = 30 //Very effective if applied spaced out over time against damage-resistant ships.
-//What you get from an incomplete torpedo.
-/obj/item/projectile/guided_munition/torpedo/dud
- icon_state = "torpedo_dud"
- damage = 0
- can_home = FALSE
-
-/obj/item/projectile/guided_munition/Initialize(mapload)
- . = ..()
- addtimer(CALLBACK(src, PROC_REF(windup)), 1 SECONDS)
-
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/item/projectile/guided_munition/proc/windup()
- valid_angle = 360 //Torpedoes "wind up" to hit their target
- homing_turn_speed *= 5
- homing_turn_speed = CLAMP(homing_turn_speed, 0, 360)
- sleep(clearance_time) //Let it get clear of the sender.
- valid_angle = initial(valid_angle)
- homing_turn_speed = initial(homing_turn_speed)
-
-/obj/item/projectile/guided_munition/missile
- name = "\improper Triton cruise missile"
- icon = 'nsv13/icons/obj/projectiles_nsv.dmi'
- icon_state = "conventional_missile"
- speed = 1
- damage = 175
- valid_angle = 120
- homing_turn_speed = 25
- range = 250
- flag = "overmap_medium"
- impact_effect_type = /obj/effect/temp_visual/impact_effect/torpedo
- spread = 5 //Helps them not get insta-bonked when launching
-
-/obj/effect/temp_visual/overmap_explosion
- icon = 'nsv13/goonstation/icons/hugeexplosion.dmi'
- icon_state = "explosion"
- duration = 10
-
-/obj/effect/temp_visual/overmap_explosion/alt
- icon = 'nsv13/goonstation/icons/hugeexplosion2.dmi'
- icon_state = "explosion"
- duration = 10
-
-//Corvid or someone please refactor this to be less messy.
-/obj/item/projectile/guided_munition/on_hit(atom/target, blocked = FALSE)
- ..()
- if(!check_faction(target))
- return FALSE //Nsv13 - faction checking for overmaps. We're gonna just cut off real early and save some math if the IFF doesn't check out.
- if(isovermap(target)) //Were we to explode on an actual overmap, this would oneshot the ship as it's a powerful explosion.
- return BULLET_ACT_HIT
- var/obj/item/projectile/P = target //This is hacky, refactor check_faction to unify both of these. I'm bodging it for now.
- if(isprojectile(target) && P.faction != faction && !P.nodamage) //Because we could be in the same faction and collide with another bullet. Let's not blow ourselves up ok?
- if(obj_integrity <= P.damage) //Tank the hit, take some damage
- qdel(P)
- explode()
- return BULLET_ACT_HIT
- else
- take_damage(P.damage)
- qdel(P)
- return FALSE //Didn't take the hit
- if(!isprojectile(target)) //This is lazy as shit but is necessary to prevent explosions triggering on the overmap when two bullets collide. Fix this shit please.
- detonate(target)
- else
- return FALSE
- return BULLET_ACT_HIT
-
/obj/item/projectile/guided_munition/torpedo/disruptor/spec_overmap_hit(obj/structure/overmap/target)
if(length(target.occupying_levels))
return //Detonate is gonna handle this for us.
@@ -514,25 +499,29 @@ Misc projectile types, effects, think of this as the special FX file.
//Neither of these? I guess just some visibility penalty it is.
target.add_sensor_profile_penalty(150, 10 SECONDS)
-/obj/item/projectile/guided_munition/torpedo/hellfire/spec_overmap_hit(obj/structure/overmap/target)
- if(length(target.occupying_levels))
- return //Ship with internal zs, let them burn
- if(target.ai_controlled || istype(target, /obj/structure/overmap/small_craft))
- target.hullburn += 60 //hullburn DoT for AIs. Player Fighters get it too, did you expect to just eat one of these?
- target.hullburn_power = max(target.hullburn_power, 6)
-
-
-/obj/item/projectile/guided_munition/bullet_act(obj/item/projectile/P)
- . = ..()
- on_hit(P)
-
-/obj/item/projectile/guided_munition/proc/detonate(atom/target)
- explosion(target, 2, 4, 4)
-
/obj/item/projectile/guided_munition/torpedo/disruptor/detonate(atom/target)
empulse(get_turf(target), 5, 12) //annoying emp.
explosion(target, 0, 2, 6, 4) //but only a light explosion.
+///What you get from an incomplete torpedo.
+/obj/item/projectile/guided_munition/torpedo/dud
+ icon_state = "torpedo_dud"
+ damage = 0
+ can_home = FALSE
+
+/obj/item/projectile/guided_munition/missile
+ name = "\improper Triton cruise missile"
+ icon = 'nsv13/icons/obj/projectiles_nsv.dmi'
+ icon_state = "conventional_missile"
+ speed = 1
+ damage = 175
+ valid_angle = 120
+ homing_turn_speed = 25
+ range = 250
+ flag = "overmap_medium"
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/torpedo
+ spread = 5 //!Helps them not get insta-bonked when launching
+
/* Sleep for now, we'll see you again
/obj/item/projectile/guided_munition/torpedo/nuclear/detonate(atom/target)
var/obj/structure/overmap/OM = target.get_overmap() //What if I just..........
@@ -544,6 +533,7 @@ Misc projectile types, effects, think of this as the special FX file.
return BULLET_ACT_HIT
*/
+
/obj/item/projectile/bullet/pdc_round
icon_state = "pdc"
name = "PDC round"
@@ -563,12 +553,31 @@ Misc projectile types, effects, think of this as the special FX file.
tracer_type = /obj/effect/projectile/tracer/disabler
muzzle_type = /obj/effect/projectile/muzzle/disabler
impact_type = /obj/effect/projectile/impact/disabler
+ relay_projectile_type = /obj/item/projectile/beam/laser/heavylaser/phaser/relayed
+
+/obj/item/projectile/beam/laser/heavylaser/phaser/relayed
+ projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE
+ flag = "laser"
+ damage = 80 //let's give them a chance to live, instead of smiting them with the full wraith of the Enterprise
+
+/obj/item/projectile/beam/laser/heavylaser/phaser/relayed/on_hit(atom/target, blocked)
+ . = ..()
+ explosion(get_turf(target), 0, 2, 4, 6, flame_range = 4) //I halved the BSA's explosion, and then poked it some myself - big boom
/obj/item/projectile/beam/laser/phaser/pd
name = "point defense phaser"
damage = 60 // Doesn't scale with power input, but fires fairly quickly especially when upgraded
icon = 'nsv13/icons/obj/projectiles_nsv.dmi'
- icon_state = "pdphaser"
+ icon_state = "pdphaser"
+ relay_projectile_type = /obj/item/projectile/beam/laser/phaser/pd/relayed
+
+/obj/item/projectile/beam/laser/phaser/pd/relayed
+ projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE
+ flag = "laser"
+
+/obj/item/projectile/beam/laser/phaser/pd/relayed/on_hit(atom/target, blocked)
+ . = ..()
+ explosion(get_turf(target), 0, 0, 2, 3, flame_range = 2) //weak, but still damaging... I hope
/obj/item/projectile/beam/laser/point_defense
name = "laser pointer"
@@ -581,11 +590,25 @@ Misc projectile types, effects, think of this as the special FX file.
tracer_type = /obj/effect/projectile/tracer/xray
muzzle_type = /obj/effect/projectile/muzzle/xray
impact_type = /obj/effect/projectile/impact/xray
+ relay_projectile_type = /obj/item/projectile/beam/laser/point_defense/relayed
+
+/obj/item/projectile/beam/laser/point_defense/relayed
+ projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE
+ flag = "laser"
-//Designed to be spammed like crazy, but can be buffed to do extremely solid damage when you overclock the guns.
+///Designed to be spammed like crazy, but can be buffed to do extremely solid damage when you overclock the guns.
/obj/item/projectile/beam/laser/phaser
damage = 30
flag = "overmap_medium"
+ relay_projectile_type = /obj/item/projectile/beam/laser/phaser/relayed
+
+/obj/item/projectile/beam/laser/phaser/relayed
+ projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE
+ flag = "laser"
+
+/obj/item/projectile/beam/laser/phaser/relayed/on_hit(atom/target, blocked)
+ . = ..()
+ explosion(get_turf(target), 0, 0, 2, 3, flame_range = 2) //weak, but still damaging... I hope
/obj/item/projectile/bullet/broadside
name = "broadside shell"
@@ -604,3 +627,13 @@ Misc projectile types, effects, think of this as the special FX file.
damage = 175
armour_penetration = 10
speed = 0.4
+
+/obj/effect/temp_visual/overmap_explosion
+ icon = 'nsv13/goonstation/icons/hugeexplosion.dmi'
+ icon_state = "explosion"
+ duration = 10
+
+/obj/effect/temp_visual/overmap_explosion/alt
+ icon = 'nsv13/goonstation/icons/hugeexplosion2.dmi'
+ icon_state = "explosion"
+ duration = 10
diff --git a/nsv13/code/modules/squads/squad_vendor.dm b/nsv13/code/modules/squads/squad_vendor.dm
index 7a1fde00433..876db0d0166 100644
--- a/nsv13/code/modules/squads/squad_vendor.dm
+++ b/nsv13/code/modules/squads/squad_vendor.dm
@@ -21,7 +21,7 @@
new /obj/item/crowbar(src)
/obj/machinery/squad_vendor
- name = "Squad Vendor"
+ name = "squad Vendor"
desc = "A machine which can dispense equipment to squads. Kits taken from this machine must be returned before you can get a new one."
icon = 'nsv13/icons/obj/computers.dmi'
icon_state = "squadvend"
@@ -32,13 +32,17 @@
resistance_flags = ACID_PROOF | FIRE_PROOF
req_one_access = list(ACCESS_HOP, ACCESS_HOS)
var/static/list/loans_info = list()
- var/static/list/loadouts = list()
+ var/loadout_type = /datum/squad_loadout/nt
+ var/list/loadouts = list()
var/static/list/requires_weapons_clearance = list(/obj/item/ammo_box, /obj/item/gun)
+/obj/machinery/squad_vendor/solgov
+ loadout_type = /datum/squad_loadout/solgov
+
/obj/machinery/squad_vendor/Initialize(mapload)
. = ..()
if(!length(loadouts))
- for(var/instance in subtypesof(/datum/squad_loadout))
+ for(var/instance in subtypesof(loadout_type))
loadouts += new instance
/obj/machinery/squad_vendor/attackby(obj/item/I, mob/living/user, params)
@@ -176,43 +180,87 @@
var/leader_only = FALSE
var/list/allowed_roles = SQUAD_TYPES
-/datum/squad_loadout/marine
+/datum/squad_loadout/nt/marine
name = "Squad Marine (Standard)"
-/datum/squad_loadout/space
+/datum/squad_loadout/nt/space
name = "Squad Marine (Hazardous Environment)"
desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
-/datum/squad_loadout/leader
+/datum/squad_loadout/nt/leader
name = "Squad Leader (Standard)"
desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
leader_only = TRUE
-/datum/squad_loadout/leader/space
+/datum/squad_loadout/nt/leader/space
name = "Squad Leader (Hazardous Environment)"
desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
-/datum/squad_loadout/engineer
+/datum/squad_loadout/nt/engineer
name = "Squad Engineer (Standard)"
desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary."
items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL)
-/datum/squad_loadout/engineer/space
+/datum/squad_loadout/nt/engineer/space
name = "Squad Engineer (Hazardous Environment)"
desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on."
items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
-/datum/squad_loadout/medic
+/datum/squad_loadout/nt/medic
name = "Squad Medic (Standard)"
desc = "A kit containing battlefield medical equipment and light squad armour."
items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
allowed_roles = list(MEDICAL_SQUAD)
-/datum/squad_loadout/medic/space
+/datum/squad_loadout/nt/medic/space
name = "Squad Medic (Hazardous Environment)"
desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries."
items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/ammo_box/magazine/glock/lethal, /obj/item/gun/ballistic/automatic/pistol/glock)
+
+
+
+/datum/squad_loadout/solgov/marine
+ name = "Squad Marine (Standard)"
+ items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old)
+
+/datum/squad_loadout/solgov/space
+ name = "Squad Marine (Hazardous Environment)"
+ desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
+ items = list(/obj/item/clothing/under/ship/marine, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old)
+
+/datum/squad_loadout/solgov/leader
+ name = "Squad Leader (Standard)"
+ desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
+ items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad/leader, /obj/item/gun/energy/laser/retro/old)
+ leader_only = TRUE
+
+/datum/squad_loadout/solgov/leader/space
+ name = "Squad Leader (Hazardous Environment)"
+ desc = "For hazardous, low pressure environments. This kit contains a reinforced skinsuit which, while slow, will protect marines from the elements."
+ items = list(/obj/item/clothing/under/ship/marine, /obj/item/megaphone, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old)
+
+/datum/squad_loadout/solgov/engineer
+ name = "Squad Engineer (Standard)"
+ desc = "This kit contains everything a squad engineer needs to effect repairs in non-hazardous environments. Recommended only for planetside operations where speed is necessary."
+ items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old)
+ allowed_roles = list(DC_SQUAD, MUNITIONS_SUPPORT, COMBAT_AIR_PATROL)
+
+/datum/squad_loadout/solgov/engineer/space
+ name = "Squad Engineer (Hazardous Environment)"
+ desc = "For hazardous, low pressure environments. This kit contains everything a squad engineer needs to effect repairs in the heat of battle, no matter the condition of the ship they're on."
+ items = list(/obj/item/clothing/under/ship/marine/engineer, /obj/item/storage/belt/utility/full, /obj/item/storage/box/damage_control, /obj/item/clothing/glasses/welding, /obj/item/clothing/suit/ship/squad/space,/obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old)
+
+/datum/squad_loadout/solgov/medic
+ name = "Squad Medic (Standard)"
+ desc = "A kit containing battlefield medical equipment and light squad armour."
+ items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/clothing/suit/ship/squad, /obj/item/clothing/head/helmet/ship/squad, /obj/item/gun/energy/laser/retro/old)
+ allowed_roles = list(MEDICAL_SQUAD)
+
+/datum/squad_loadout/solgov/medic/space
+ name = "Squad Medic (Hazardous Environment)"
+ desc = "For hazardous, low pressure environments. This kit contains specialist equipment for treating common battlefield injuries."
+ items = list(/obj/item/clothing/under/ship/marine/medic, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/medspray/sterilizine, /obj/item/reagent_containers/medspray/styptic, /obj/item/storage/firstaid/o2, /obj/item/clothing/suit/ship/squad/space, /obj/item/clothing/head/helmet/ship/squad/space, /obj/item/gun/energy/laser/retro/old)
diff --git a/nsv13/code/modules/surgery/bodyparts/nsv_modular_bodypart_overrides.dm b/nsv13/code/modules/surgery/bodyparts/nsv_modular_bodypart_overrides.dm
new file mode 100644
index 00000000000..73d2b0a3a91
--- /dev/null
+++ b/nsv13/code/modules/surgery/bodyparts/nsv_modular_bodypart_overrides.dm
@@ -0,0 +1,17 @@
+//This file is for some NSV bodypart overrides to avoid throwing them into base files.
+
+///Bonus text to get for a given limb in its examine.
+/obj/item/bodypart/proc/bonus_limb_id_text()
+ return ""
+
+//These two are here because how the name is static-built is stupid and this is a nice-ish way to attach to it.
+
+/obj/item/bodypart/r_leg/robot/bonus_limb_id_text()
+ if(bodytype & BODYTYPE_DIGITIGRADE)
+ return " robotic"
+ return ""
+
+/obj/item/bodypart/l_leg/robot/bonus_limb_id_text()
+ if(bodytype & BODYTYPE_DIGITIGRADE)
+ return " robotic"
+ return ""
diff --git a/nsv13/icons/mob/augmentation/digitigrade_legs.dmi b/nsv13/icons/mob/augmentation/digitigrade_legs.dmi
new file mode 100644
index 00000000000..43456a5132d
Binary files /dev/null and b/nsv13/icons/mob/augmentation/digitigrade_legs.dmi differ
diff --git a/nsv13/icons/mob/head.dmi b/nsv13/icons/mob/head.dmi
index 6e2d2ecaf9f..9db6b16434c 100644
Binary files a/nsv13/icons/mob/head.dmi and b/nsv13/icons/mob/head.dmi differ
diff --git a/nsv13/icons/mob/suit.dmi b/nsv13/icons/mob/suit.dmi
index cea84ef18c2..11e86cd757f 100644
Binary files a/nsv13/icons/mob/suit.dmi and b/nsv13/icons/mob/suit.dmi differ
diff --git a/nsv13/icons/obj/clothing/hats.dmi b/nsv13/icons/obj/clothing/hats.dmi
index 95ac354857a..62366b0b4e3 100644
Binary files a/nsv13/icons/obj/clothing/hats.dmi and b/nsv13/icons/obj/clothing/hats.dmi differ
diff --git a/nsv13/icons/obj/clothing/suits.dmi b/nsv13/icons/obj/clothing/suits.dmi
index 7de9dbe3f13..a84613439d6 100644
Binary files a/nsv13/icons/obj/clothing/suits.dmi and b/nsv13/icons/obj/clothing/suits.dmi differ
diff --git a/nsv13/icons/obj/fighter_components.dmi b/nsv13/icons/obj/fighter_components.dmi
index 14e7fdfe0cb..19ab2d06627 100644
Binary files a/nsv13/icons/obj/fighter_components.dmi and b/nsv13/icons/obj/fighter_components.dmi differ
diff --git a/nsv13/icons/overmap/new/solgov/fighter.dmi b/nsv13/icons/overmap/new/solgov/fighter.dmi
index 1f9d3d8685e..7bddad47bf3 100644
Binary files a/nsv13/icons/overmap/new/solgov/fighter.dmi and b/nsv13/icons/overmap/new/solgov/fighter.dmi differ
diff --git a/nsv13/icons/overmap/new/solgov/playablefighter.dmi b/nsv13/icons/overmap/new/solgov/playablefighter.dmi
new file mode 100644
index 00000000000..e2778f38bdf
Binary files /dev/null and b/nsv13/icons/overmap/new/solgov/playablefighter.dmi differ
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index a45a38c163d..a3e49b56b83 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -8,6 +8,6 @@
"glob": "^7.1.7",
"source-map": "^0.7.4",
"stacktrace-parser": "^0.1.10",
- "ws": "^8.12.1"
+ "ws": "^8.17.1"
}
}
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 85af9e52c95..8a4626b6fcf 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -3236,11 +3236,11 @@ __metadata:
linkType: hard
"braces@npm:^3.0.1, braces@npm:~3.0.2":
- version: 3.0.2
- resolution: "braces@npm:3.0.2"
+ version: 3.0.3
+ resolution: "braces@npm:3.0.3"
dependencies:
- fill-range: ^7.0.1
- checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+ fill-range: ^7.1.1
+ checksum: b95aa0b3bd909f6cd1720ffcf031aeaf46154dd88b4da01f9a1d3f7ea866a79eba76a6d01cbc3c422b2ee5cdc39a4f02491058d5df0d7bf6e6a162a832df1f69
languageName: node
linkType: hard
@@ -4875,12 +4875,12 @@ __metadata:
languageName: node
linkType: hard
-"fill-range@npm:^7.0.1":
- version: 7.0.1
- resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+ version: 7.1.1
+ resolution: "fill-range@npm:7.1.1"
dependencies:
to-regex-range: ^5.0.1
- checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+ checksum: b4abfbca3839a3d55e4ae5ec62e131e2e356bf4859ce8480c64c4876100f4df292a63e5bb1618e1d7460282ca2b305653064f01654474aa35c68000980f17798
languageName: node
linkType: hard
@@ -9214,7 +9214,7 @@ __metadata:
glob: ^7.1.7
source-map: ^0.7.4
stacktrace-parser: ^0.1.10
- ws: ^8.12.1
+ ws: ^8.17.1
languageName: unknown
linkType: soft
@@ -10118,9 +10118,9 @@ __metadata:
languageName: node
linkType: hard
-"ws@npm:^8.11.0, ws@npm:^8.12.1":
- version: 8.12.1
- resolution: "ws@npm:8.12.1"
+"ws@npm:^8.11.0, ws@npm:^8.17.1":
+ version: 8.18.0
+ resolution: "ws@npm:8.18.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
@@ -10129,7 +10129,7 @@ __metadata:
optional: true
utf-8-validate:
optional: true
- checksum: 97301c1c4d838fc81bd413f370f75c12aabe44527b31323b761eab3043a9ecb7e32ffd668548382c9a6a5ad3a1c3a9249608e8338e6b939f2f9540f1e21970b5
+ checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
languageName: node
linkType: hard