diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm
index 8623b6df448..aeca85c0c25 100644
--- a/_maps/map_files/vonneumann/vnmk3.dmm
+++ b/_maps/map_files/vonneumann/vnmk3.dmm
@@ -1,4 +1,25 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/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/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc/auto_name/north,
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
+"ab" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/nsv/weapons)
 "ac" = (
 /obj/machinery/seed_extractor,
 /turf/open/floor/carpet/ship,
@@ -10,6 +31,38 @@
 "ae" = (
 /turf/closed/wall/r_wall/ship,
 /area/nsv/weapons/fore)
+"af" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+	dir = 4;
+	name = "layer1";
+	piping_layer = 1;
+	icon_state = "pipe11-1"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
+"ag" = (
+/obj/structure/hull_plate,
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"ah" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
 "ai" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 10
@@ -54,6 +107,12 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
+"am" = (
+/obj/machinery/light/small/broken,
+/obj/structure/closet/emcloset,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "an" = (
 /obj/structure/closet/radiation,
 /turf/open/floor/carpet/ship/orange_carpet,
@@ -107,6 +166,18 @@
 /obj/machinery/light,
 /turf/open/floor/engine,
 /area/nsv/hanger)
+"au" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "av" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
@@ -142,8 +213,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "az" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -318,6 +390,11 @@
 /obj/machinery/light,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"aQ" = (
+/obj/effect/turf_decal/tile/purple/tile_side,
+/obj/item/kirbyplants/random,
+/turf/open/floor/plasteel,
+/area/science/lobby)
 "aR" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -340,6 +417,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "aW" = (
@@ -413,7 +491,7 @@
 /area/maintenance/nsv/starboard_substation)
 "bf" = (
 /turf/closed/wall/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "bg" = (
 /obj/structure/hull_plate/end{
 	dir = 9
@@ -441,7 +519,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "bi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
@@ -533,6 +611,7 @@
 /area/nsv/weapons)
 "bt" = (
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "bu" = (
@@ -647,6 +726,18 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"bG" = (
+/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/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "bH" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -657,7 +748,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "bI" = (
 /obj/structure/chair,
 /obj/machinery/light/small{
@@ -694,6 +785,12 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"bM" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "bN" = (
 /obj/machinery/smartfridge,
 /obj/structure/cable{
@@ -701,6 +798,33 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
+"bP" = (
+/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/effect/landmark/patrol_node{
+	id = 5;
+	next_id = 6
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
+"bQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/closet/firecloset/full,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "bS" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
 	dir = 8
@@ -717,6 +841,17 @@
 "bT" = (
 /turf/closed/wall/ship,
 /area/crew_quarters/toilet/restrooms)
+"bU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/maintenance/five,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "bW" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 8
@@ -755,6 +890,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/light/small{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
 "cc" = (
@@ -782,6 +920,7 @@
 "cf" = (
 /obj/machinery/chem_dispenser/drinks/beer,
 /obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/bar/mess_hall)
 "cg" = (
@@ -814,6 +953,15 @@
 "cj" = (
 /turf/closed/wall/r_wall/ship,
 /area/ai_monitored/security/armory)
+"ck" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "cl" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /obj/machinery/atmospherics/pipe/simple/brown/hidden{
@@ -870,6 +1018,21 @@
 /obj/machinery/power/apc/auto_name/east,
 /turf/open/floor/plasteel,
 /area/science/lobby)
+"ct" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "cu" = (
 /obj/machinery/computer/card/minor/hos,
 /turf/open/floor/carpet/ship/red_carpet,
@@ -895,6 +1058,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
 "cz" = (
@@ -940,9 +1104,27 @@
 /obj/structure/munitions_trolley,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"cF" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/ship,
+/area/science/lobby)
 "cG" = (
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"cH" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
+"cI" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "cK" = (
 /obj/structure/hull_plate/end{
 	dir = 1
@@ -969,11 +1151,12 @@
 /area/crew_quarters/heads/cmo)
 "cO" = (
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "cP" = (
 /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2{
 	dir = 10
 	},
+/obj/item/beacon,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "cQ" = (
@@ -988,6 +1171,10 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window{
+	dir = 1
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "cS" = (
@@ -1119,6 +1306,10 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/captain/private)
+"dg" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/engine/gravity_generator)
 "dh" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
@@ -1142,6 +1333,7 @@
 "dl" = (
 /obj/effect/turf_decal/tile/purple/tile_side,
 /obj/machinery/camera/autoname,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel,
 /area/science/lobby)
 "dm" = (
@@ -1233,6 +1425,10 @@
 /obj/machinery/ship_weapon/vls,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"dv" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/hallway/upper/primary/starboard)
 "dw" = (
 /obj/structure/closet/radiation,
 /obj/machinery/light/small{
@@ -1246,7 +1442,7 @@
 /area/maintenance/nsv/bunker)
 "dx" = (
 /turf/closed/wall/r_wall/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "dy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1268,7 +1464,7 @@
 	dir = 5
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "dB" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1280,8 +1476,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/closet/firecloset/full,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "dC" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/beige_carpet{
@@ -1302,6 +1499,7 @@
 	},
 /obj/machinery/camera/autoname,
 /obj/machinery/computer/ship/viewscreen,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/xenobiology)
 "dF" = (
@@ -1316,6 +1514,8 @@
 /area/engine/storage)
 "dG" = (
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/obj/structure/grille/broken,
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
 "dH" = (
@@ -1341,6 +1541,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "dJ" = (
@@ -1411,8 +1612,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "dP" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -1446,6 +1648,10 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/captain/private)
+"dU" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/hallway/upper/primary/starboard)
 "dV" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1468,7 +1674,7 @@
 	dir = 4
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "dX" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{
 	dir = 4
@@ -1491,8 +1697,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "dZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1523,6 +1730,7 @@
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "ec" = (
@@ -1533,7 +1741,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "ed" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1585,8 +1793,9 @@
 /obj/machinery/camera/autoname,
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "ej" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1621,6 +1830,32 @@
 	},
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/camera/motion,
+/obj/structure/safe,
+/obj/structure/window{
+	dir = 4
+	},
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/door/window/northleft{
+	req_one_access_txt = "16";
+	dir = 2
+	},
+/obj/item/documents/nanotrasen,
+/obj/item/fakeartefact,
+/obj/item/grenade/clusterbuster/smoke,
+/obj/item/bikehorn/golden,
+/obj/item/book/random,
+/obj/item/book/random,
+/obj/item/book/random,
+/obj/item/stack/sheet/mineral/gold,
+/obj/item/storage/belt/champion,
+/obj/item/crowbar/brass{
+	desc = "A crowbar made out of pure gold. It feels extremely cold to the touch.";
+	materials = list(/datum/material/gold=50);
+	name = "golden crowbar"
+	},
+/obj/item/stack/sheet/mineral/gold,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai)
 "en" = (
@@ -1673,6 +1908,10 @@
 	},
 /turf/open/floor/engine,
 /area/engine/armour_pump)
+"eu" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/carpet/ship/orange_carpet,
+/area/engine/engineering)
 "ev" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1836,7 +2075,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "eP" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1920,11 +2159,21 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "eY" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/durasteel/techfloor_grid/airless,
 /area/science/robotics)
+"eZ" = (
+/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,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "fa" = (
 /turf/open/floor/engine/air,
 /area/engine/atmos/port_atmos)
@@ -1973,6 +2222,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
 "fh" = (
@@ -2015,7 +2265,7 @@
 "fm" = (
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "fn" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2026,6 +2276,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "fo" = (
@@ -2039,8 +2290,9 @@
 /obj/machinery/computer/ship/viewscreen,
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "fq" = (
 /obj/structure/table/reinforced,
 /obj/structure/window{
@@ -2086,12 +2338,7 @@
 	dir = 4
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
-"fu" = (
-/obj/structure/grille/wall,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
+/area/hallway/primary/aft)
 "fv" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -2127,6 +2374,23 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
+"fz" = (
+/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/machinery/camera/autoname,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc/auto_name/north,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "fA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -2143,6 +2407,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"fC" = (
+/obj/machinery/firealarm/partyalarm,
+/turf/closed/wall/r_wall/ship,
+/area/bridge/cic)
 "fE" = (
 /obj/effect/turf_decal/tile/blue/flat_side{
 	dir = 6
@@ -2159,7 +2427,7 @@
 	},
 /obj/machinery/computer/ship/viewscreen,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "fG" = (
 /obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/engine,
@@ -2187,6 +2455,10 @@
 	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"fL" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/medical/medbay)
 "fM" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -2226,7 +2498,11 @@
 	dir = 4
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
+"fR" = (
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "fS" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
@@ -2331,6 +2607,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/crew_quarters/heads/hos)
 "gf" = (
@@ -2358,6 +2635,10 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"gh" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "gi" = (
 /obj/item/reagent_containers/glass/beaker/cryoxadone,
 /obj/item/reagent_containers/glass/beaker/cryoxadone,
@@ -2379,6 +2660,10 @@
 	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
+"gk" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/weapons/port)
 "gl" = (
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/atmospherics/pipe/simple/brown/hidden{
@@ -2515,6 +2800,10 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/plasteel,
 /area/science/lobby)
+"gE" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/teleporter)
 "gF" = (
 /obj/machinery/camera/autoname,
 /obj/machinery/computer/ship/viewscreen,
@@ -2585,7 +2874,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "gO" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -2657,7 +2946,7 @@
 /obj/machinery/door/airlock/ship/public/glass,
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "gX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/structure/cable/yellow{
@@ -2671,6 +2960,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet/west,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "gZ" = (
@@ -2728,6 +3018,10 @@
 	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
+"hf" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/maintenance/nsv/ftlroom)
 "hg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
 	dir = 5
@@ -2887,6 +3181,10 @@
 /obj/structure/bed/roller,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"hA" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/captain/private)
 "hC" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
@@ -2907,6 +3205,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
 "hF" = (
@@ -2940,6 +3239,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/aisat_interior)
 "hI" = (
@@ -3004,6 +3304,7 @@
 /obj/machinery/camera/autoname{
 	dir = 5
 	},
+/obj/structure/extinguisher_cabinet/west,
 /turf/open/floor/carpet/ship,
 /area/security)
 "hR" = (
@@ -3015,6 +3316,7 @@
 /area/cargo/lobby)
 "hS" = (
 /obj/structure/displaycase/labcage,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/crew_quarters/heads/hor)
 "hT" = (
@@ -3034,7 +3336,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "hW" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3094,7 +3396,7 @@
 "id" = (
 /obj/machinery/squad_vendor,
 /turf/closed/wall/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "ie" = (
 /obj/structure/sign/plaques/atmos,
 /turf/closed/wall/r_wall/ship,
@@ -3154,6 +3456,7 @@
 /obj/structure/closet/secure_closet/hop,
 /obj/item/gun/energy/e_gun/mini/heads,
 /obj/machinery/computer/lore_terminal,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/ship/blue{
 	color = "#9999DD";
 	name = "nanoweave carpet (bluer)"
@@ -3189,8 +3492,13 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/navbeacon,
+/obj/item/beacon,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
+"ir" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/engine/engineering)
 "is" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 4
@@ -3333,6 +3641,10 @@
 	},
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai)
+"iK" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/maintenance/nsv/bunker)
 "iL" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -3356,6 +3668,10 @@
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/carpet/ship,
 /area/security)
+"iP" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/science/xenobiology)
 "iQ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3473,6 +3789,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"je" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/engine/shield_generator)
 "jf" = (
 /obj/structure/hull_plate/end{
 	dir = 1
@@ -3528,7 +3848,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "jk" = (
 /obj/structure/window/reinforced,
 /obj/structure/cable/yellow{
@@ -3549,6 +3869,13 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
+"jo" = (
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/blue{
+	color = "#9999DD";
+	name = "nanoweave carpet (bluer)"
+	},
+/area/crew_quarters/heads/xo)
 "jp" = (
 /obj/machinery/space_heater,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -3578,6 +3905,7 @@
 	dir = 5
 	},
 /obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "js" = (
@@ -3592,6 +3920,10 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
+"jv" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
 "jw" = (
 /obj/machinery/suit_storage_unit/captain,
 /turf/open/floor/carpet/ship/blue{
@@ -3613,6 +3945,10 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/xo)
+"jz" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/turret_protected/ai)
 "jA" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3668,7 +4004,7 @@
 	dir = 10
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "jG" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 6
@@ -3752,6 +4088,13 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/engine/light,
 /area/maintenance/nsv/starboard_substation)
+"jR" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame1/central)
 "jS" = (
 /obj/machinery/rnd/destructive_analyzer,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3809,6 +4152,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"jY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "jZ" = (
 /obj/structure/cable,
 /obj/machinery/power/terminal{
@@ -3928,7 +4281,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "km" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/camera/autoname{
@@ -3948,13 +4301,26 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/camera/autoname,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "kp" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"kq" = (
+/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/machinery/airalarm/directional/south,
+/turf/open/floor/carpet/ship,
+/area/security)
 "kr" = (
 /obj/structure/table/reinforced,
 /obj/structure/window{
@@ -3969,6 +4335,10 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"kt" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship/orange_carpet,
+/area/engine/engineering)
 "ku" = (
 /obj/machinery/ai_slipper,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -3979,6 +4349,17 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/aisat_interior)
+"kv" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "kw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
 	dir = 4
@@ -3986,6 +4367,7 @@
 /obj/machinery/computer/atmos_control/tank/toxin_tank{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "kx" = (
@@ -3999,7 +4381,7 @@
 	dir = 8
 	},
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "kz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -4015,6 +4397,7 @@
 	dir = 8
 	},
 /obj/machinery/firealarm/directional/east,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "kB" = (
@@ -4040,6 +4423,25 @@
 	},
 /turf/open/floor/engine,
 /area/maintenance/nsv/bunker)
+"kE" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
+"kF" = (
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "kG" = (
 /obj/machinery/light{
 	dir = 4
@@ -4081,6 +4483,12 @@
 	},
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"kM" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "kN" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
@@ -4149,6 +4557,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window{
+	dir = 1
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "kX" = (
@@ -4175,6 +4587,7 @@
 	},
 /obj/machinery/computer/monitor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "la" = (
@@ -4189,7 +4602,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "lb" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 10
@@ -4251,8 +4664,13 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "lj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4316,6 +4734,13 @@
 /obj/effect/spawner/structure/window/reinforced/ship,
 /turf/open/floor/engine,
 /area/cargo/lobby)
+"ls" = (
+/obj/machinery/cryopod{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/ship/blue,
+/area/crew_quarters/cryopods)
 "lt" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
 	dir = 1;
@@ -4324,6 +4749,19 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/engine/atmos/port_atmos)
+"lu" = (
+/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
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "lv" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -4338,6 +4776,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
 "lx" = (
@@ -4368,7 +4807,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "lB" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
 	dir = 4
@@ -4472,6 +4911,26 @@
 /obj/machinery/teleport/hub,
 /turf/open/floor/carpet/ship,
 /area/teleporter)
+"lN" = (
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/security/armory)
+"lO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "lP" = (
 /turf/closed/wall/r_wall/ship,
 /area/hydroponics)
@@ -4508,15 +4967,11 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "lU" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science)
-"lV" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
 "lW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plating,
@@ -4596,6 +5051,17 @@
 	},
 /turf/open/floor/monotile/light,
 /area/crew_quarters/heads/cmo)
+"me" = (
+/obj/machinery/shieldwallgen{
+	anchored = 1;
+	shield_range = 32;
+	locked = 0;
+	maximum_stored_power = 1000;
+	name = "long range shield wall generator"
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/durasteel,
+/area/engine/storage)
 "mf" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4625,7 +5091,7 @@
 	},
 /obj/machinery/camera/autoname,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "mi" = (
 /obj/machinery/door/airlock/ship/command{
 	name = "Master At Arms";
@@ -4675,6 +5141,10 @@
 /obj/machinery/computer/ship/viewscreen,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"mn" = (
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "mo" = (
 /obj/item/ship_weapon/ammunition/torpedo/torpedo_casing,
 /turf/open/floor/carpet/ship/beige_carpet,
@@ -4697,7 +5167,10 @@
 /area/engine/engineering/reactor_core)
 "mt" = (
 /obj/structure/table/reinforced,
-/obj/machinery/recharger,
+/obj/machinery/recharger{
+	pixel_x = -8;
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/bar/mess_hall)
 "mu" = (
@@ -4800,6 +5273,10 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/security/brig)
+"mG" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/engine/engineering/reactor_core)
 "mH" = (
 /obj/structure/reagent_dispensers/cooking_oil,
 /obj/machinery/light{
@@ -4921,6 +5398,12 @@
 /obj/machinery/vending/wardrobe/science_wardrobe,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
+"na" = (
+/obj/effect/spawner/lootdrop/maintenance/seven,
+/obj/structure/rack,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "nc" = (
 /obj/structure/hull_plate/end{
 	dir = 4
@@ -4954,6 +5437,7 @@
 /obj/structure/closet/crate/engineering/electrical,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/clothing/gloves/color/yellow,
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "ng" = (
@@ -5002,7 +5486,7 @@
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "nm" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/structure/cable/yellow{
@@ -5040,8 +5524,21 @@
 /obj/machinery/camera/autoname{
 	dir = 5
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
+"nq" = (
+/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
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "nr" = (
 /obj/structure/hull_plate/end{
 	dir = 10
@@ -5169,6 +5666,7 @@
 /obj/machinery/computer/atmos_control/tank/air_tank{
 	dir = 1
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "nK" = (
@@ -5180,6 +5678,18 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons)
+"nL" = (
+/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
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "nM" = (
 /obj/machinery/door/airlock/ship/external/glass{
 	name = "Hangar External Airlock";
@@ -5237,7 +5747,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "nR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -5249,6 +5759,10 @@
 /obj/effect/spawner/structure/window/reinforced/ship,
 /turf/open/floor/carpet/ship/blue,
 /area/bridge/cic)
+"nU" = (
+/obj/machinery/status_display,
+/turf/closed/wall/ship,
+/area/science/robotics)
 "nV" = (
 /obj/structure/hull_plate/end,
 /turf/open/space/basic,
@@ -5272,6 +5786,7 @@
 "oa" = (
 /obj/effect/landmark/start/assistant,
 /obj/structure/chair,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/engine,
 /area/maintenance/nsv/bunker)
 "oc" = (
@@ -5367,7 +5882,9 @@
 /area/engine/atmos/port_atmos)
 "ok" = (
 /obj/structure/table/reinforced,
-/obj/machinery/coffeemaker,
+/obj/machinery/coffeemaker{
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/bar/mess_hall)
 "on" = (
@@ -5376,6 +5893,14 @@
 	},
 /turf/open/floor/engine/n2o,
 /area/engine/atmos/port_atmos)
+"oo" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel,
+/area/crew_quarters/toilet/restrooms)
 "op" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5384,7 +5909,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "oq" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -5415,7 +5940,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "ou" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2,
@@ -5510,6 +6035,10 @@
 /obj/item/ship_weapon/parts/missile/iff_card,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
+"oG" = (
+/obj/item/beacon,
+/turf/open/floor/carpet/ship/beige_carpet,
+/area/nsv/weapons/port)
 "oH" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -5608,6 +6137,13 @@
 /obj/item/gun/energy/temperature/security,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
+"oV" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/port)
 "oW" = (
 /obj/machinery/door/poddoor/shutters/ship,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -5650,6 +6186,7 @@
 	dir = 8
 	},
 /obj/machinery/firealarm/directional/north,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/monotile/light,
 /area/crew_quarters/heads/cmo)
 "pb" = (
@@ -5763,6 +6300,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/lobby)
+"pn" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/hydroponics)
 "po" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{
 	dir = 4
@@ -5776,6 +6317,10 @@
 /obj/machinery/computer/rdconsole/production,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"pp" = (
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/ship/purple_carpet,
+/area/science/lab)
 "pq" = (
 /obj/machinery/atmospherics/components/trinary/mixer/flipped/layer2{
 	dir = 1;
@@ -5820,6 +6365,12 @@
 	},
 /turf/open/floor/engine,
 /area/engine/shield_generator)
+"px" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "py" = (
 /obj/effect/landmark/start/ai/secondary,
 /turf/open/floor/circuit,
@@ -5828,6 +6379,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai_upload)
 "pA" = (
@@ -5862,6 +6414,7 @@
 /turf/open/floor/engine,
 /area/engine/armour_pump)
 "pE" = (
+/obj/machinery/requests_console,
 /turf/closed/wall/r_wall/ship,
 /area/science/lobby)
 "pF" = (
@@ -5966,6 +6519,12 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
+"pS" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "pT" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/structure/cable{
@@ -6028,8 +6587,13 @@
 	dir = 6
 	},
 /obj/machinery/vending/wardrobe/gene_wardrobe,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"qb" = (
+/obj/machinery/status_display,
+/turf/closed/wall/ship,
+/area/crew_quarters/dorms)
 "qc" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -6133,6 +6697,10 @@
 /obj/machinery/suit_storage_unit/mining/eva,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"qo" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/security)
 "qp" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -6221,6 +6789,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/aisat/hallway)
 "qy" = (
@@ -6262,6 +6831,11 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai)
+"qE" = (
+/obj/structure/bed/pod,
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/engine,
+/area/maintenance/nsv/bunker)
 "qF" = (
 /obj/machinery/recharge_station,
 /obj/effect/landmark/start/cyborg,
@@ -6287,10 +6861,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/tcommsat/computer)
 "qJ" = (
 /obj/machinery/computer/ship/viewscreen,
+/obj/structure/closet/emcloset,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "qK" = (
@@ -6309,6 +6885,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"qN" = (
+/obj/structure/closet/radiation,
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_y = 10
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/engine,
+/area/maintenance/nsv/bunker)
 "qO" = (
 /obj/machinery/door/airlock/ship/maintenance{
 	name = "Exterior Shield"
@@ -6332,7 +6920,22 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
+"qQ" = (
+/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/machinery/door/firedoor/heavy,
+/obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "qR" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6394,6 +6997,11 @@
 	},
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science)
+"qX" = (
+/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "qY" = (
 /obj/machinery/door/airlock/ship/station/research,
 /obj/structure/cable{
@@ -6436,6 +7044,10 @@
 /obj/machinery/computer/ship/munitions_computer/west,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"rd" = (
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/science/xenobiology)
 "re" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -6497,6 +7109,16 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"rp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "rq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -6520,7 +7142,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "rs" = (
 /obj/machinery/camera/autoname,
 /turf/open/floor/engine,
@@ -6571,6 +7193,10 @@
 	dir = 8
 	},
 /mob/living/simple_animal/bot/secbot/beepsky,
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "ry" = (
@@ -6620,6 +7246,13 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"rG" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "rH" = (
 /obj/machinery/computer/ship/navigation/public{
 	dir = 1
@@ -6636,7 +7269,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "rK" = (
 /obj/machinery/air_sensor/atmos/nitrogen_tank,
 /turf/open/floor/engine/n2,
@@ -6671,6 +7304,13 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"rQ" = (
+/obj/machinery/status_display/ai,
+/obj/machinery/status_display/ai,
+/obj/machinery/status_display/ai,
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/science/robotics)
 "rR" = (
 /obj/structure/overmap/small_craft/transport/sabre/mining,
 /turf/open/floor/engine,
@@ -6683,7 +7323,17 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
+"rT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/crate_spawner,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "rU" = (
 /obj/machinery/light{
 	dir = 4
@@ -6718,10 +7368,13 @@
 /obj/machinery/camera/autoname{
 	dir = 5
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "sa" = (
-/obj/item/radio/intercom,
+/obj/item/radio/intercom{
+	pixel_x = -7
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -6798,6 +7451,7 @@
 	dir = 1
 	},
 /obj/machinery/computer/ship/viewscreen,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "si" = (
@@ -6861,6 +7515,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
+"sq" = (
+/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/extinguisher_cabinet/north,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "sr" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
@@ -6868,6 +7535,10 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_y = 10
+	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
 "ss" = (
@@ -6939,6 +7610,13 @@
 	},
 /turf/open/floor/engine,
 /area/maintenance/nsv/bunker)
+"sC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "sD" = (
 /obj/machinery/computer/cloning{
 	dir = 4
@@ -6966,7 +7644,7 @@
 	dir = 9
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "sG" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -6988,6 +7666,26 @@
 /obj/effect/turf_decal/tile/brown/tile_side,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"sI" = (
+/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/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
+"sJ" = (
+/obj/machinery/status_display,
+/turf/closed/wall/ship,
+/area/hallway/upper/primary/starboard)
 "sL" = (
 /obj/machinery/camera/autoname{
 	dir = 10
@@ -7072,6 +7770,18 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
+"sW" = (
+/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
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "sX" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -7081,7 +7791,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "sY" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible{
 	dir = 4
@@ -7191,6 +7901,13 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/window{
+	dir = 8
+	},
+/obj/structure/window,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "tm" = (
@@ -7333,6 +8050,20 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"tH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/spawner/lootdrop/trap,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "tJ" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
@@ -7386,6 +8117,15 @@
 	},
 /turf/open/floor/engine,
 /area/nsv/hanger)
+"tO" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "tP" = (
 /obj/effect/spawner/structure/window/reinforced/ship,
 /turf/open/floor/carpet/ship,
@@ -7445,6 +8185,10 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
+"tX" = (
+/obj/machinery/airalarm/server,
+/turf/closed/wall/r_wall/ship,
+/area/tcommsat/server)
 "tY" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/engine,
@@ -7511,6 +8255,13 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons/fore)
+"ug" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/item/beacon,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
 "uh" = (
 /obj/structure/closet{
 	anchored = 1;
@@ -7578,6 +8329,10 @@
 /area/engine/engineering)
 "um" = (
 /obj/effect/landmark/start/assistant,
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/window,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "un" = (
@@ -7608,11 +8363,11 @@
 /obj/machinery/door/airlock/ship/public/glass,
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "uq" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "ur" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -7778,6 +8533,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/brown/hidden,
+/obj/item/beacon,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
 "uO" = (
@@ -7839,8 +8595,13 @@
 /area/engine/atmos/port_atmos)
 "uU" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/closet/emcloset,
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"uV" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/hanger)
 "uW" = (
 /obj/structure/lattice,
 /obj/machinery/camera/autoname,
@@ -7857,7 +8618,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "uY" = (
 /obj/structure/rack,
 /obj/item/ship_weapon/ammunition/naval_artillery/cannonball,
@@ -7875,6 +8636,7 @@
 	dir = 8
 	},
 /mob/living/simple_animal/parrot/Poly,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/crew_quarters/heads/chief)
 "vb" = (
@@ -7894,6 +8656,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
+/obj/effect/landmark/patrol_node{
+	id = 2;
+	next_id = 3
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
 "ve" = (
@@ -7914,6 +8680,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/item/beacon,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "vh" = (
@@ -7928,7 +8695,7 @@
 	dir = 10
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "vi" = (
 /obj/machinery/atmospherics/components/binary/drive_pylon,
 /obj/structure/cable/yellow,
@@ -7982,6 +8749,8 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/airalarm/directional/north,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/carpet/ship/blue{
 	color = "#9999DD";
 	name = "nanoweave carpet (bluer)"
@@ -8032,8 +8801,10 @@
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
+/obj/machinery/coffeemaker,
+/obj/structure/table/glass/plasma,
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "vt" = (
 /obj/structure/sign/warning/radiation,
 /turf/closed/wall/ship,
@@ -8061,6 +8832,16 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
 /area/bridge/cic)
+"vv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "vx" = (
 /obj/machinery/door/window/brigdoor/security/cell/southright{
 	id = "pw_2";
@@ -8253,10 +9034,14 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
 "vV" = (
-/obj/item/radio/intercom,
+/obj/item/radio/intercom{
+	pixel_y = 7;
+	pixel_x = -6
+	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -8266,6 +9051,10 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
+"vW" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/captain/private)
 "vX" = (
 /obj/machinery/light{
 	dir = 1
@@ -8382,6 +9171,10 @@
 "wl" = (
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"wm" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/ship,
+/area/maintenance/nsv/bunker)
 "wn" = (
 /obj/structure/displaycase/captain,
 /obj/machinery/light,
@@ -8458,7 +9251,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "wx" = (
 /obj/structure/lattice,
 /obj/structure/hull_plate/end,
@@ -8483,6 +9276,7 @@
 "wC" = (
 /obj/machinery/computer/ship/fighter_controller,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship/beige_carpet{
 	color = "#CC8899";
 	name = "nanoweave carpet (puce)"
@@ -8595,6 +9389,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/item/beacon,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "wO" = (
@@ -8804,6 +9599,29 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"xj" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/landmark/patrol_node{
+	id = 3;
+	next_id = 4
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=4";
+	location = "3"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "xk" = (
 /turf/open/space/basic,
 /area/space/nearstation)
@@ -8877,7 +9695,7 @@
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "xv" = (
 /obj/effect/landmark/start/detective,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -8888,6 +9706,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/crew_quarters/heads/chief)
 "xx" = (
@@ -8901,7 +9720,7 @@
 	dir = 5
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "xy" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
 	dir = 4
@@ -8936,8 +9755,16 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/obj/effect/landmark/patrol_node{
+	id = 6;
+	next_id = 7
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"xC" = (
+/obj/effect/spawner/hangover_spawn,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "xD" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -8947,6 +9774,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/nuclear_waste_spawner,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/engine,
 /area/engine/engineering/reactor_core)
 "xE" = (
@@ -9074,7 +9902,7 @@
 	},
 /obj/machinery/camera/autoname,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "xU" = (
 /obj/machinery/door/airlock/ship/command{
 	name = "Executive Officer Office";
@@ -9101,6 +9929,15 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/xo)
+"xV" = (
+/obj/effect/landmark/latejoin,
+/obj/structure/extinguisher_cabinet/south,
+/turf/open/floor/carpet/ship/blue,
+/area/crew_quarters/cryopods)
+"xW" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/weapons/fore)
 "xX" = (
 /obj/structure/hull_plate/end{
 	dir = 10
@@ -9148,8 +9985,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "ye" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{
 	dir = 4
@@ -9174,7 +10012,7 @@
 	dir = 10
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "yh" = (
 /obj/machinery/syndicatebomb/training,
 /obj/structure/table/wood,
@@ -9259,6 +10097,7 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "yp" = (
@@ -9273,6 +10112,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/window,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "yr" = (
@@ -9300,6 +10143,12 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
+"yt" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "yu" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -9384,6 +10233,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
+"yG" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/captain/private)
 "yH" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/power/terminal,
@@ -9449,22 +10302,21 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "yQ" = (
 /turf/closed/wall/r_wall/ship,
 /area/crew_quarters/cryopods)
 "yR" = (
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
 /obj/structure/rack,
 /obj/machinery/light{
 	dir = 1
 	},
 /obj/item/gun/energy/laser/retro,
 /obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
 "yT" = (
@@ -9634,8 +10486,29 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"zq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
+"zr" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "zs" = (
 /obj/machinery/computer/prisoner/management,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/security/armory)
 "zt" = (
@@ -9660,7 +10533,7 @@
 "zv" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/engine/airless,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "zw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
@@ -9777,6 +10650,19 @@
 /obj/machinery/computer/secure_data,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/crew_quarters/heads/hos)
+"zJ" = (
+/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/extinguisher_cabinet/south,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
 "zK" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -9816,6 +10702,10 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons)
+"zP" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "zQ" = (
 /obj/machinery/light{
 	dir = 8
@@ -9854,8 +10744,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/item/beacon,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "zT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9978,6 +10869,7 @@
 /area/nsv/weapons/fore)
 "Ad" = (
 /obj/effect/landmark/start/randommaint,
+/obj/structure/grille/broken,
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
 "Ae" = (
@@ -10017,8 +10909,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Ak" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -10037,6 +10930,10 @@
 /obj/item/storage/box/bodybags,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"Am" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/science/lobby)
 "An" = (
 /obj/effect/turf_decal/pool{
 	dir = 1
@@ -10136,6 +11033,7 @@
 "AC" = (
 /obj/structure/closet/secure_closet/armory1,
 /obj/effect/spawner/lootdrop/armory_contraband,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
 "AD" = (
@@ -10214,7 +11112,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "AN" = (
 /obj/machinery/power/port_gen/pacman,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -10229,6 +11127,10 @@
 	},
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
+"AP" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/gravity_generator)
 "AQ" = (
 /obj/structure/sign/departments/minsky/research/robotics,
 /turf/closed/wall/ship,
@@ -10328,7 +11230,7 @@
 	},
 /obj/machinery/camera/autoname,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Bb" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -10398,10 +11300,18 @@
 /obj/structure/sign/departments/cargo,
 /turf/closed/wall/r_wall/ship,
 /area/nsv/weapons/port)
+"Bm" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/engine/atmos/port_atmos)
 "Bn" = (
 /obj/machinery/mech_bay_recharge_port,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science)
+"Bo" = (
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "Bq" = (
 /obj/effect/turf_decal/pool{
 	dir = 8
@@ -10433,6 +11343,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"Bt" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "Bu" = (
 /obj/machinery/modular_computer/console/preset/command,
 /turf/open/floor/carpet/ship/blue{
@@ -10486,6 +11402,21 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"BD" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "BE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -10604,8 +11535,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/landmark/patrol_node{
+	id = 1;
+	next_id = 2
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=1";
+	location = "4"
+	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "BT" = (
 /obj/machinery/gravity_generator/main/station,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -10629,6 +11568,7 @@
 /area/engine/atmos/port_atmos)
 "BW" = (
 /obj/machinery/atmospherics/pipe/manifold/green/visible,
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
 "BX" = (
@@ -10649,6 +11589,16 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
+"Ca" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons/fore)
 "Cb" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10802,7 +11752,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Cw" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10896,6 +11846,17 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons)
+"CI" = (
+/obj/effect/landmark/start/assistant,
+/obj/structure/chair/fancy/shuttle{
+	dir = 1
+	},
+/obj/structure/window{
+	dir = 4
+	},
+/obj/structure/window,
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "CJ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10907,7 +11868,7 @@
 /obj/structure/grille/wall,
 /obj/structure/lattice,
 /turf/open/space/basic,
-/area/space)
+/area/space/nearstation)
 "CM" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -10951,6 +11912,19 @@
 "CS" = (
 /turf/closed/wall/r_wall/ship,
 /area/tcommsat/server)
+"CT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "CV" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -10967,8 +11941,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "CW" = (
 /obj/machinery/computer/bank_machine,
 /turf/open/floor/circuit,
@@ -11001,6 +11976,12 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/security/armory)
+"Db" = (
+/obj/structure/hull_plate,
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "Dc" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 8
@@ -11013,6 +11994,10 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"Dd" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/engine/engineering/reactor_core)
 "Df" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -11025,10 +12010,18 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons/fore)
+"Dg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
+	dir = 4
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship/orange_carpet,
+/area/engine/atmos/port_atmos)
 "Dh" = (
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "Di" = (
@@ -11156,6 +12149,10 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
+"Dy" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/science/xenobiology)
 "Dz" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
@@ -11177,6 +12174,10 @@
 	},
 /turf/open/floor/engine,
 /area/cargo/lobby)
+"DC" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/cryopods)
 "DE" = (
 /obj/machinery/squad_vendor,
 /turf/closed/wall/r_wall/ship,
@@ -11266,6 +12267,10 @@
 	},
 /turf/open/floor/engine/airless,
 /area/space/nearstation)
+"DT" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/weapons/port)
 "DU" = (
 /obj/effect/turf_decal/tile/brown/tile_side,
 /obj/machinery/computer/ship/dradis/minor/cargo{
@@ -11382,6 +12387,19 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
+"Ec" = (
+/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/machinery/camera/autoname,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Ed" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -11397,8 +12415,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "Ee" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
 	dir = 4
@@ -11417,6 +12436,7 @@
 /area/crew_quarters/heads/xo)
 "Eg" = (
 /obj/machinery/porta_turret/ai,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload_foyer)
 "Eh" = (
@@ -11522,6 +12542,7 @@
 	},
 /obj/machinery/power/apc/auto_name/north,
 /obj/machinery/rnd/production/techfab/department/service,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "Ev" = (
@@ -11555,6 +12576,18 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/xo)
+"EA" = (
+/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/carpet/ship,
+/area/hallway/primary/aft)
 "EB" = (
 /obj/structure/closet/secure_closet/master_at_arms,
 /obj/machinery/camera/autoname{
@@ -11685,6 +12718,10 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons)
+"EP" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/turret_protected/aisat/hallway)
 "EQ" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -11696,7 +12733,7 @@
 	dir = 9
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "ER" = (
 /obj/machinery/hydroponics/constructable,
 /obj/structure/cable{
@@ -11765,6 +12802,7 @@
 /obj/machinery/shieldgen{
 	anchored = 1
 	},
+/obj/structure/extinguisher_cabinet/west,
 /turf/open/floor/circuit,
 /area/bridge/cic)
 "Fc" = (
@@ -11792,6 +12830,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/item/beacon,
 /turf/open/floor/plasteel,
 /area/science/lobby)
 "Ff" = (
@@ -11835,6 +12874,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
+"Fi" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "Fj" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/power/terminal{
@@ -11875,6 +12927,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/teleporter)
 "Fm" = (
@@ -11897,6 +12950,13 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons/fore)
+"Fp" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/beige_carpet,
+/area/nsv/weapons/port)
 "Fq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -11911,7 +12971,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "Fr" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -11922,7 +12982,7 @@
 "Fs" = (
 /obj/effect/landmark/start/captain,
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "Ft" = (
 /obj/effect/turf_decal/pool{
 	dir = 8
@@ -12035,7 +13095,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "FG" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2,
@@ -12230,7 +13290,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/obj/item/gun/energy/laser/retro/old,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/security/armory)
 "Gc" = (
@@ -12288,6 +13347,10 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"Gk" = (
+/obj/structure/extinguisher_cabinet/south,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/gravity_generator)
 "Gl" = (
 /obj/machinery/door_timer{
 	id = "pw_2";
@@ -12317,10 +13380,14 @@
 	},
 /turf/open/floor/engine,
 /area/nsv/weapons/port)
+"Gn" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/engine/atmos/port_atmos)
 "Go" = (
 /obj/structure/closet/firecloset/full,
 /turf/open/floor/circuit,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "Gp" = (
 /obj/effect/turf_decal/tile/purple/tile_side{
 	dir = 1
@@ -12346,6 +13413,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
 "Gr" = (
@@ -12398,6 +13466,22 @@
 /obj/effect/spawner/structure/window/reinforced/ship,
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"Gy" = (
+/obj/structure/lattice,
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/ai)
+"Gz" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/port)
 "GA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
@@ -12415,8 +13499,13 @@
 /obj/machinery/computer/ship/ordnance{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons)
+"GD" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/xo)
 "GE" = (
 /obj/effect/turf_decal/tile/purple/tile_side{
 	dir = 4
@@ -12443,7 +13532,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "GH" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/aimodule_harmless,
@@ -12462,7 +13551,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "GJ" = (
 /obj/machinery/photocopier,
 /turf/open/floor/carpet/ship/blue{
@@ -12473,6 +13562,10 @@
 "GK" = (
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
+"GL" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/security/armory)
 "GM" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -12503,8 +13596,13 @@
 	icon_state = "0-8"
 	},
 /obj/structure/closet/secure_closet/hydroponics,
+/obj/item/gun/energy/floragun,
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
+"GQ" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/xo)
 "GR" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -12607,6 +13705,13 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
+"Hc" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
 "Hd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{
 	dir = 4
@@ -12684,6 +13789,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
+"Hq" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/weapons/port)
 "Hr" = (
 /obj/machinery/conveyor/slow{
 	dir = 6;
@@ -12719,6 +13828,14 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"Hw" = (
+/obj/effect/landmark/latejoin,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet/ship/blue,
+/area/crew_quarters/cryopods)
 "Hy" = (
 /obj/structure/shuttle/engine/huge,
 /obj/structure/lattice,
@@ -12729,6 +13846,15 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
+"HB" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/r_wall/ship,
+/area/engine/gravity_generator)
+"HC" = (
+/obj/machinery/suit_storage_unit/pilot,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/engine,
+/area/nsv/hanger)
 "HG" = (
 /obj/structure/sink/kitchen{
 	dir = 4;
@@ -12753,6 +13879,14 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
 /area/space/nearstation)
+"HI" = (
+/obj/structure/hull_plate/end{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "HJ" = (
 /obj/machinery/ai_slipper,
 /obj/structure/window{
@@ -12903,6 +14037,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/engine,
 /area/engine/armour_pump)
 "Ic" = (
@@ -13030,6 +14165,7 @@
 	icon_state = "2-4"
 	},
 /obj/structure/closet/emcloset,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/circuit,
 /area/bridge/cic)
 "Ir" = (
@@ -13084,6 +14220,10 @@
 	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"Iy" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/hallway/upper/primary/port)
 "Iz" = (
 /obj/machinery/modular_computer/console/preset/engineering{
 	dir = 8
@@ -13256,8 +14396,13 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
 	},
+/obj/machinery/status_display,
 /turf/closed/wall/r_wall/ship,
 /area/engine/atmos/port_atmos)
+"IX" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/engine/storage)
 "IY" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
@@ -13310,7 +14455,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "Jd" = (
 /obj/machinery/door/airlock/ship/external/glass,
 /obj/effect/mapping_helpers/airlock/unres,
@@ -13357,11 +14502,23 @@
 /obj/machinery/vending/wardrobe/atmos_wardrobe,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"Jj" = (
+/obj/effect/landmark/start/assistant,
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window{
+	dir = 4
+	},
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "Jk" = (
 /obj/machinery/computer/atmos_control/tank/nitrous_tank{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "Jl" = (
@@ -13376,6 +14533,12 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/aisat/hallway)
+"Jm" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "Jn" = (
 /obj/structure/sink{
 	dir = 4;
@@ -13413,6 +14576,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/item/beacon,
 /turf/open/floor/carpet/ship/blue,
 /area/bridge/cic)
 "Js" = (
@@ -13453,6 +14617,17 @@
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/engine,
 /area/engine/engineering/reactor_core)
+"Jy" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/trap,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "Jz" = (
 /obj/effect/landmark/start/roboticist,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -13477,8 +14652,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/engine,
 /area/engine/engineering/reactor_core)
+"JC" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/circuit,
+/area/hallway/nsv/deck1/frame1/central)
 "JD" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2,
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -13511,8 +14691,14 @@
 "JF" = (
 /obj/structure/closet/radiation,
 /obj/machinery/computer/ship/viewscreen,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/engine,
 /area/maintenance/nsv/bunker)
+"JG" = (
+/obj/structure/hull_plate,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "JH" = (
 /obj/machinery/dna_scannernew,
 /obj/effect/turf_decal/tile/blue/flat_side{
@@ -13548,7 +14734,7 @@
 	icon_state = "1-8"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "JM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13682,15 +14868,30 @@
 /obj/machinery/atmospherics/miner/nitrogen,
 /turf/open/floor/engine/n2,
 /area/engine/atmos/port_atmos)
+"Kd" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/r_wall/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "Ke" = (
 /turf/closed/wall/ship,
 /area/crew_quarters/cryopods)
+"Kf" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/port)
 "Kg" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/security/armory)
+"Kh" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/cryopods)
 "Ki" = (
 /turf/closed/wall/r_wall/ship,
 /area/nsv/weapons)
@@ -13717,7 +14918,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "Kn" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -13737,6 +14938,10 @@
 /obj/structure/sign/ship/medical,
 /turf/closed/wall/r_wall/ship,
 /area/medical/medbay)
+"Kr" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/maintenance/nsv/ftlroom)
 "Ks" = (
 /obj/machinery/ai_slipper,
 /obj/structure/window,
@@ -13806,7 +15011,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "KC" = (
 /obj/machinery/camera/autoname{
 	dir = 8
@@ -13915,8 +15120,25 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
+"KS" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible/layer4{
+	piping_layer = 5;
+	name = "layer5";
+	dir = 1;
+	icon_state = "pipe11-5"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/ship/orange_carpet,
+/area/engine/engineering)
 "KT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -13950,13 +15172,17 @@
 /obj/machinery/turretid{
 	pixel_y = -32
 	},
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
 "La" = (
 /obj/structure/table/reinforced,
 /obj/machinery/reagentgrinder{
 	desc = "It's just an all-in-one grinder with a label taped to it. How wasteful";
-	name = "blender"
+	name = "blender";
+	pixel_y = 8;
+	pixel_x = -7
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/bar/mess_hall)
@@ -13976,6 +15202,17 @@
 	},
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science)
+"Ld" = (
+/obj/structure/lattice,
+/obj/machinery/camera/autoname{
+	dir = 8
+	},
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/ai)
+"Le" = (
+/obj/machinery/status_display,
+/turf/closed/wall/ship,
+/area/science/xenobiology)
 "Lf" = (
 /turf/closed/wall/ship,
 /area/engine/engineering)
@@ -13990,7 +15227,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/mine/stun/smart,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
 "Lh" = (
@@ -14032,8 +15268,14 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/structure/extinguisher_cabinet/south,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"Ln" = (
+/obj/structure/closet/crate/secure/loot,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "Lo" = (
 /obj/effect/turf_decal/tile/purple/tile_side,
 /obj/structure/rack,
@@ -14104,7 +15346,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "Lu" = (
 /obj/machinery/power/apc/auto_name/north,
 /obj/structure/cable{
@@ -14202,6 +15444,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/restrooms)
+"LH" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/extinguisher_cabinet/south,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/aft)
 "LI" = (
 /obj/machinery/light/floor,
 /turf/open/floor/engine,
@@ -14213,6 +15462,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/carpet/ship,
 /area/tcommsat/computer)
 "LK" = (
@@ -14268,8 +15518,10 @@
 	icon_state = "2-8";
 	tag = ""
 	},
+/obj/machinery/airalarm/directional/north,
+/obj/structure/closet/emcloset,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "LQ" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /obj/effect/landmark/start/atmospheric_technician,
@@ -14427,12 +15679,20 @@
 /obj/machinery/computer/ship/ftl_core/preset,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
+"Mn" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/weapons)
 "Mo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{
 	dir = 4
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"Mp" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/science/xenobiology)
 "Mq" = (
 /obj/machinery/air_sensor/atmos{
 	id_tag = "nuclear_sensor"
@@ -14442,6 +15702,10 @@
 	},
 /turf/open/floor/engine/airless,
 /area/engine/engineering/reactor_core)
+"Mr" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/port)
 "Ms" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -14469,6 +15733,10 @@
 "Mv" = (
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
+"Mw" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/xo)
 "Mx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -14484,12 +15752,17 @@
 /area/engine/engineering)
 "My" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/engine,
 /area/engine/shield_generator)
 "Mz" = (
 /obj/structure/closet/crate/freezer/surplus_limbs,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"MA" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/turret_protected/aisat_interior)
 "MB" = (
 /obj/machinery/atmospherics/pipe/simple/purple/visible/layer4{
 	dir = 6
@@ -14524,6 +15797,10 @@
 /obj/machinery/smartfridge/extract,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/xenobiology)
+"MF" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/ship,
+/area/science/robotics)
 "MG" = (
 /obj/effect/landmark/start/scientist,
 /turf/open/floor/carpet/ship/purple_carpet,
@@ -14533,7 +15810,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "MI" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -14543,6 +15820,20 @@
 	},
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
+"MJ" = (
+/obj/effect/landmark/start/assistant,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window{
+	dir = 8
+	},
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "MK" = (
 /obj/machinery/shieldwallgen{
 	anchored = 1;
@@ -14561,6 +15852,7 @@
 "MM" = (
 /obj/structure/table/wood,
 /obj/machinery/coffeemaker,
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/brig)
 "MN" = (
@@ -14674,6 +15966,19 @@
 	},
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
+"MX" = (
+/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/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "MY" = (
 /obj/machinery/light{
 	dir = 4
@@ -14811,7 +16116,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "Nn" = (
 /obj/effect/turf_decal/tile/brown/tile_side{
 	dir = 6
@@ -14930,8 +16235,32 @@
 /obj/effect/spawner/lootdrop/techstorage/command,
 /obj/effect/spawner/lootdrop/techstorage/AI,
 /obj/structure/closet/crate/secure/engineering,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/engine,
 /area/engine/gravity_generator)
+"NC" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/landmark/patrol_node{
+	id = 4;
+	next_id = 5
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=3";
+	location = "2"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "ND" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -15021,6 +16350,14 @@
 /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"NN" = (
+/obj/effect/landmark/start/assistant,
+/obj/structure/chair/fancy/shuttle,
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "NO" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
@@ -15205,6 +16542,14 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons/fore)
+"Ok" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "Ol" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/machinery/telecomms/processor/preset_two,
@@ -15236,6 +16581,14 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/landmark/patrol_node{
+	id = 7;
+	next_id = 1
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=2";
+	location = "1"
+	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "Op" = (
@@ -15250,7 +16603,11 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
+"Oq" = (
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Or" = (
 /obj/structure/cable{
 	icon_state = "2-8";
@@ -15400,6 +16757,13 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons/fore)
+"OH" = (
+/obj/machinery/atmospherics/pipe/simple/brown/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "OI" = (
 /obj/machinery/computer/security/telescreen,
 /turf/closed/wall/r_wall/ship,
@@ -15422,6 +16786,7 @@
 /area/engine/gravity_generator)
 "OL" = (
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
 "OM" = (
@@ -15463,6 +16828,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai)
 "OR" = (
@@ -15565,7 +16931,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Pe" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -15604,9 +16970,25 @@
 /obj/structure/fans/tiny/invisible,
 /turf/open/space/basic,
 /area/space/nearstation)
+"Ph" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
+"Pi" = (
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "Pj" = (
 /obj/machinery/light,
 /obj/machinery/atmospherics/pipe/manifold/cyan/visible,
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "Pl" = (
@@ -15677,6 +17059,7 @@
 	piping_layer = 1;
 	icon_state = "pipe11-1"
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "Pt" = (
@@ -15725,6 +17108,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "Pz" = (
@@ -15758,7 +17142,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
 "PC" = (
 /obj/effect/turf_decal/tile/purple/tile_side,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -15775,7 +17159,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "PE" = (
 /obj/machinery/telecomms/bus/preset_two,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
@@ -15801,6 +17185,12 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/engine,
 /area/cargo/lobby)
+"PG" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "PH" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -15860,7 +17250,7 @@
 	dir = 5
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "PM" = (
 /obj/machinery/camera/autoname{
 	dir = 8
@@ -15915,6 +17305,10 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/captain/private)
+"PU" = (
+/obj/machinery/firealarm,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/turret_protected/aisat_interior)
 "PV" = (
 /turf/closed/wall/ship,
 /area/medical/medbay)
@@ -15937,7 +17331,6 @@
 /obj/item/storage/box/chemimp,
 /obj/machinery/camera/motion,
 /obj/item/gun/energy/e_gun/dragnet,
-/obj/item/gun/energy/laser/retro/old,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/ai_monitored/security/armory)
 "PY" = (
@@ -15954,6 +17347,29 @@
 /obj/structure/table/glass,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"Qb" = (
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons/fore)
+"Qc" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons/fore)
 "Qd" = (
 /obj/machinery/computer/reactor/fuel_rods,
 /obj/structure/table,
@@ -15968,6 +17384,12 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"Qf" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Qg" = (
 /obj/machinery/holopad,
 /obj/structure/cable/yellow{
@@ -16000,6 +17422,27 @@
 /obj/machinery/missile_builder/wirer,
 /turf/open/floor/circuit/green/anim,
 /area/nsv/weapons/port)
+"Qk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
+"Ql" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Qm" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16088,7 +17531,19 @@
 	},
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
+"Qw" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Qx" = (
 /obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
@@ -16253,6 +17708,7 @@
 /obj/machinery/computer/rdconsole/production{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "QQ" = (
@@ -16288,6 +17744,17 @@
 /obj/structure/noticeboard/captain,
 /turf/closed/wall/r_wall/ship,
 /area/crew_quarters/heads/captain/private)
+"QW" = (
+/obj/machinery/status_display,
+/turf/closed/wall/ship,
+/area/engine/engineering)
+"QX" = (
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/security/brig)
 "QY" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -16311,8 +17778,15 @@
 	dir = 10
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/structure/closet/crate/engineering,
+/obj/item/hand_tele,
+/obj/item/beacon,
 /turf/open/floor/carpet/ship,
 /area/teleporter)
+"Rd" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/turret_protected/ai)
 "Re" = (
 /obj/effect/spawner/structure/window/reinforced/ship,
 /turf/open/floor/engine,
@@ -16339,6 +17813,27 @@
 /obj/machinery/holopad,
 /turf/open/floor/carpet/ship/blue,
 /area/bridge/cic)
+"Rk" = (
+/obj/machinery/atmospherics/pipe/simple/brown/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/lootdrop/nac_ammo,
+/obj/structure/closet/crate,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
+"Rl" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/engine,
+/area/cargo/lobby)
 "Rm" = (
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/light{
@@ -16346,6 +17841,10 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"Rn" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/circuit,
+/area/hallway/nsv/deck1/frame1/central)
 "Ro" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -16399,13 +17898,20 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"Rv" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "Rw" = (
 /obj/effect/decal/cleanable/robot_debris/old,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Rx" = (
 /obj/effect/mob_spawn/slime,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -16477,6 +17983,14 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"RG" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet/ship/beige_carpet,
+/area/nsv/weapons/port)
+"RH" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/teleporter)
 "RI" = (
 /obj/structure/bodycontainer/morgue{
 	dir = 8
@@ -16539,6 +18053,14 @@
 	},
 /turf/open/floor/engine,
 /area/engine/armour_pump)
+"RS" = (
+/obj/machinery/atmospherics/pipe/simple/brown/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/lootdrop/maintenance/six,
+/obj/structure/rack,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
 "RT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -16553,7 +18075,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "RU" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -16622,7 +18144,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/mob/living/simple_animal/hostile/mimic/crate,
+/obj/structure/closet/crate/secure/loot,
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
 "Sc" = (
@@ -16651,6 +18173,7 @@
 	pixel_y = 5;
 	target_layer = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
 "Sh" = (
@@ -16665,7 +18188,7 @@
 	},
 /obj/machinery/computer/lore_terminal,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Si" = (
 /obj/structure/hull_plate/end{
 	dir = 6
@@ -16751,6 +18274,18 @@
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
+"Sv" = (
+/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
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "Sw" = (
 /obj/effect/landmark/latejoin,
 /obj/structure/cable{
@@ -16874,8 +18409,25 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/effect/spawner/lootdrop/glowstick/lit,
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
+"SJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons/fore)
 "SK" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -16886,6 +18438,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "SL" = (
@@ -16920,8 +18473,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "SQ" = (
 /obj/machinery/door/airlock/ship/external/glass,
 /obj/effect/mapping_helpers/airlock/unres{
@@ -16933,10 +18487,28 @@
 	},
 /turf/open/floor/engine,
 /area/nsv/hanger)
+"ST" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hydroponics)
 "SU" = (
 /obj/machinery/atmospherics/miner/n2o,
 /turf/open/floor/engine/n2o,
 /area/engine/atmos/port_atmos)
+"SV" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
+"SW" = (
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship,
+/area/hallway/secondary/exit/departure_lounge)
 "SX" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 4
@@ -17045,12 +18617,21 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/auto_name/north,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "Tq" = (
 /obj/machinery/holopad,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
+"Tr" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "Ts" = (
 /obj/machinery/door/airlock/ship/maintenance{
 	name = "Exterior Shield"
@@ -17085,6 +18666,15 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"Tv" = (
+/obj/structure/extinguisher_cabinet/south,
+/turf/open/floor/carpet/ship,
+/area/ai_monitored/storage/eva)
+"Tw" = (
+/obj/machinery/suit_storage_unit/atmos,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/carpet/ship/orange_carpet,
+/area/engine/atmos/port_atmos)
 "Tx" = (
 /obj/machinery/squad_vendor,
 /turf/closed/wall/ship,
@@ -17151,6 +18741,18 @@
 	},
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"TE" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/cargo/lobby)
+"TF" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/cmo)
+"TG" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "TH" = (
 /obj/structure/closet/secure_closet/captains,
 /obj/machinery/light{
@@ -17169,6 +18771,19 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/blue,
 /area/crew_quarters/cryopods)
+"TJ" = (
+/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/item/beacon,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
 "TK" = (
 /obj/machinery/computer/atmos_control/tank/carbon_tank{
 	dir = 4
@@ -17215,7 +18830,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "TO" = (
 /obj/structure/chair/fancy/shuttle{
 	dir = 1
@@ -17245,6 +18860,10 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
+"TT" = (
+/obj/item/relic,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "TU" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -17319,6 +18938,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/nsv/port_substation)
+"Ud" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/nsv/hanger)
 "Ue" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
 	dir = 4
@@ -17428,11 +19051,21 @@
 /obj/item/bedsheet/orange,
 /turf/open/floor/carpet/ship,
 /area/security/brig)
+"Ur" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/obj/item/extinguisher/advanced/hull_repair_juice,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "Us" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger{
 	pixel_x = 7
 	},
+/obj/item/stamp/xo,
+/obj/machinery/coffeemaker{
+	pixel_y = 14
+	},
 /turf/open/floor/carpet/ship/blue{
 	color = "#9999DD";
 	name = "nanoweave carpet (bluer)"
@@ -17440,6 +19073,7 @@
 /area/crew_quarters/heads/xo)
 "Ut" = (
 /obj/machinery/processor,
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/bar/mess_hall)
 "Uu" = (
@@ -17496,6 +19130,10 @@
 /obj/machinery/light,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai)
+"Uy" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/ship,
+/area/ai_monitored/turret_protected/ai)
 "Uz" = (
 /obj/machinery/power/rad_collector/solgov,
 /turf/open/floor/durasteel,
@@ -17519,6 +19157,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"UE" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/security)
 "UF" = (
 /obj/machinery/light,
 /turf/open/floor/carpet/ship/orange_carpet,
@@ -17538,7 +19180,15 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/central)
+/area/hallway/nsv/deck1/frame1/central)
+"UI" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/structure/closet/firecloset/full,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "UJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -17587,6 +19237,10 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"UP" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/science/robotics)
 "UQ" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -17631,6 +19285,13 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"UU" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons/fore)
 "UV" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -17679,6 +19340,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/machinery/door/airlock/ship/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/nsv/starboard_substation)
 "Vb" = (
@@ -17705,6 +19367,15 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"Vf" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/starboard)
 "Vg" = (
 /obj/machinery/light{
 	dir = 4
@@ -17740,6 +19411,7 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/engine,
+/obj/structure/extinguisher_cabinet/west,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "Vj" = (
@@ -17952,6 +19624,13 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"VH" = (
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/beige_carpet{
+	color = "#CC8899";
+	name = "nanoweave carpet (puce)"
+	},
+/area/nsv/weapons)
 "VI" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
 	dir = 4
@@ -17974,6 +19653,13 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"VK" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/emcloset,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
 "VL" = (
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
@@ -18073,7 +19759,7 @@
 	},
 /obj/structure/closet/firecloset/full,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/nsv/deck1/frame2/port)
 "VW" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -18121,6 +19807,12 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"Wb" = (
+/obj/structure/munitions_trolley,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/beige_carpet,
+/area/nsv/weapons/port)
 "Wc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -18136,8 +19828,9 @@
 	},
 /obj/machinery/door/firedoor/heavy,
 /obj/effect/landmark/zebra_interlock_point,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Wd" = (
 /obj/vehicle/ridden/janicart,
 /obj/structure/window/reinforced{
@@ -18185,6 +19878,7 @@
 /area/maintenance/nsv/starboard_substation)
 "Wk" = (
 /obj/machinery/porta_turret/ai,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai_upload)
 "Wm" = (
@@ -18193,12 +19887,17 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/firealarm/directional/north,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
 "Wn" = (
 /obj/machinery/holopad,
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
+"Wo" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/starboard)
 "Wp" = (
 /turf/closed/wall/ship,
 /area/maintenance/nsv/bunker)
@@ -18231,7 +19930,7 @@
 	dir = 5
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "Ww" = (
 /obj/machinery/door/airlock/ship/external/glass,
 /obj/effect/mapping_helpers/airlock/unres,
@@ -18303,7 +20002,7 @@
 	dir = 9
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "WE" = (
 /obj/machinery/hydroponics/constructable,
 /turf/open/floor/carpet/ship,
@@ -18399,7 +20098,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "WN" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -18408,6 +20107,22 @@
 /obj/item/storage/firstaid/regular,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"WO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/structure/rack,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/nsv/starboard_substation)
+"WP" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/engine/engineering)
 "WQ" = (
 /obj/item/radio/intercom{
 	freerange = 1;
@@ -18502,6 +20217,7 @@
 	dir = 6
 	},
 /obj/machinery/recharge_station,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
 "WZ" = (
@@ -18518,7 +20234,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "Xc" = (
 /obj/machinery/atmospherics/pipe/simple/purple/visible/layer2{
 	dir = 6
@@ -18537,6 +20253,10 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
+"Xf" = (
+/obj/machinery/requests_console,
+/turf/closed/wall/ship,
+/area/crew_quarters/dorms)
 "Xg" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -18606,6 +20326,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai_upload_foyer)
 "Xq" = (
@@ -18641,6 +20362,7 @@
 	icon_state = "pipe11-5";
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "Xu" = (
@@ -18670,6 +20392,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/durasteel,
 /area/engine/storage)
+"Xx" = (
+/obj/effect/landmark/latejoin,
+/obj/structure/extinguisher_cabinet/west,
+/turf/open/floor/carpet/ship/blue,
+/area/crew_quarters/cryopods)
 "Xy" = (
 /obj/effect/mapping_helpers/airlock/locked,
 /obj/machinery/door/airlock/ship/engineering/glass{
@@ -18723,8 +20450,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
+/obj/structure/extinguisher_cabinet/west,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/port)
+/area/hallway/upper/primary/port)
 "XE" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -18741,10 +20469,6 @@
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
-"XG" = (
-/obj/effect/mine/sound/bwoink,
-/turf/open/floor/plating,
-/area/maintenance/starboard)
 "XI" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor/border_only{
@@ -18807,6 +20531,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet/south,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science)
 "XQ" = (
@@ -18822,12 +20547,19 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
+"XR" = (
+/obj/structure/lattice,
+/obj/machinery/camera/autoname,
+/turf/open/space/basic,
+/area/ai_monitored/turret_protected/ai)
 "XS" = (
 /obj/machinery/computer/rdservercontrol{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/crew_quarters/heads/hor)
 "XT" = (
@@ -18862,6 +20594,10 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/crew_quarters/heads/maa)
+"XY" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/ship,
+/area/cargo/lobby)
 "XZ" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -18891,6 +20627,13 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
+"Yc" = (
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/durasteel/techfloor_grid,
+/area/engine/gravity_generator)
+"Yd" = (
+/turf/closed/wall/r_wall/ship,
+/area/hallway/upper/primary/starboard)
 "Ye" = (
 /obj/structure/table,
 /obj/item/clothing/glasses/welding,
@@ -19025,6 +20768,20 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/engine/gravity_generator)
+"Yr" = (
+/obj/effect/turf_decal/tile/purple/tile_side{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/plasteel,
+/area/science/lobby)
+"Ys" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall/ship,
+/area/ai_monitored/security/armory)
 "Yt" = (
 /obj/machinery/atmospherics/pipe/simple/brown/hidden,
 /obj/structure/cable{
@@ -19065,6 +20822,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet/east,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
 "YA" = (
@@ -19076,6 +20834,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "YB" = (
@@ -19212,6 +20971,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/effect/spawner/lootdrop/glowstick/lit,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "YS" = (
@@ -19225,7 +20985,7 @@
 "YV" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/engine,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "YW" = (
 /obj/structure/table/wood,
 /obj/item/squad_pager/all_channels,
@@ -19241,6 +21001,10 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"Za" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/engine,
+/area/engine/shield_generator)
 "Zb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
 	dir = 8;
@@ -19268,6 +21032,13 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
+"Zd" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/carpet/ship,
+/area/hallway/primary/starboard)
 "Ze" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/carpet/ship,
@@ -19321,6 +21092,13 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/crew_quarters/heads/hor)
+"Zm" = (
+/obj/machinery/requests_console,
+/obj/machinery/requests_console,
+/obj/machinery/requests_console,
+/obj/machinery/requests_console,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/xo)
 "Zn" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -19341,6 +21119,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/ship/delivery/yellow,
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/exit/departure_lounge)
 "Zr" = (
@@ -19374,7 +21153,7 @@
 	dir = 1
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/primary/aft)
 "Zx" = (
 /obj/machinery/atmospherics/components/unary/thermomachine,
 /turf/open/floor/carpet/ship/orange_carpet,
@@ -19391,7 +21170,7 @@
 /area/nsv/weapons/fore)
 "Zz" = (
 /turf/closed/wall/ship,
-/area/hallway/primary/starboard)
+/area/hallway/upper/primary/starboard)
 "ZA" = (
 /obj/machinery/door/airlock/ship/maintenance{
 	name = "Cargo radiation bunker"
@@ -19410,6 +21189,22 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/engine,
 /area/maintenance/nsv/bunker)
+"ZC" = (
+/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/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc/auto_name/south,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "ZE" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -19423,6 +21218,12 @@
 	},
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
+"ZG" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/crate,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/nsv/port_substation)
 "ZH" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -19437,7 +21238,7 @@
 	dir = 8
 	},
 /turf/open/floor/carpet/ship,
-/area/hallway/primary/starboard)
+/area/hallway/nsv/deck1/frame2/starboard)
 "ZJ" = (
 /obj/machinery/computer/atmos_control/tank{
 	dir = 1;
@@ -19461,6 +21262,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science)
 "ZM" = (
@@ -19475,6 +21277,31 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"ZN" = (
+/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/effect/spawner/xmastree,
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame1/central)
+"ZO" = (
+/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
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/upper/primary/port)
 "ZP" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -19521,6 +21348,10 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/xo)
+"ZU" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall/ship,
+/area/crew_quarters/heads/captain/private)
 "ZV" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -30976,7 +32807,7 @@ lq
 Uz
 Uz
 mS
-wf
+IX
 Ir
 wg
 wr
@@ -31198,14 +33029,14 @@ Ep
 YC
 NQ
 JU
-Mh
+dg
 Yl
 JT
 Zt
 Mh
 CS
 CS
-CS
+tX
 CS
 CS
 CS
@@ -31385,7 +33216,7 @@ sf
 Yi
 kC
 pu
-oO
+Dd
 xD
 Th
 eN
@@ -31580,7 +33411,7 @@ dF
 lq
 OC
 OC
-OC
+me
 OC
 Ty
 ph
@@ -31615,7 +33446,7 @@ xh
 pM
 wd
 Wj
-Mv
+xC
 Mv
 Wj
 Wj
@@ -31765,7 +33596,7 @@ gM
 qG
 qG
 yf
-dG
+ZG
 iX
 KZ
 Cz
@@ -31807,7 +33638,7 @@ Ov
 Mh
 Mh
 QO
-Mh
+dg
 Mh
 FV
 Ol
@@ -31967,9 +33798,9 @@ qG
 qG
 qG
 yf
-wl
+Bo
 iB
-wl
+Bo
 Cz
 Tm
 Ox
@@ -31998,15 +33829,15 @@ vJ
 kh
 Yv
 Jx
-xl
+eu
 kn
 Og
 xN
-xl
+kt
 CY
 Lf
 BR
-bz
+gh
 KD
 qI
 tv
@@ -32021,7 +33852,7 @@ ml
 Wj
 gV
 Ak
-Mv
+Ln
 Wj
 qG
 qG
@@ -32193,7 +34024,7 @@ po
 we
 yV
 ON
-oO
+mG
 Vb
 EE
 xb
@@ -32221,7 +34052,7 @@ TV
 Ee
 Sl
 Ei
-Mv
+kF
 Ho
 Ad
 Wj
@@ -32388,7 +34219,7 @@ Eh
 Vt
 UL
 UL
-Vt
+Gn
 xl
 iu
 gG
@@ -32409,7 +34240,7 @@ oy
 Iw
 WF
 Ve
-ZH
+ct
 rr
 tT
 MC
@@ -32425,7 +34256,7 @@ Ue
 jQ
 fS
 Ho
-Mv
+am
 Wj
 Sp
 Sp
@@ -32573,7 +34404,7 @@ er
 Sp
 Sp
 yf
-wl
+Bo
 iB
 Vt
 lk
@@ -32611,15 +34442,15 @@ dN
 Ro
 Az
 CX
-iT
-oR
+nL
+LH
 qv
 qv
 gz
 gz
 NT
 gz
-gz
+hf
 gz
 XL
 XL
@@ -32627,7 +34458,7 @@ gz
 gz
 gz
 Ho
-Mv
+kF
 Wj
 Sp
 Sp
@@ -32775,8 +34606,8 @@ qG
 qG
 qG
 yf
-wl
-iB
+TG
+CT
 Vt
 by
 xy
@@ -32812,9 +34643,9 @@ ll
 sS
 Yp
 aq
-Lf
+ir
 XQ
-oR
+yt
 od
 DQ
 fJ
@@ -32828,7 +34659,7 @@ Mk
 fX
 Ly
 gz
-Ho
+rT
 Mv
 Wj
 qG
@@ -32977,7 +34808,7 @@ er
 Sp
 Lz
 yf
-wl
+Bo
 iB
 Vt
 UL
@@ -33030,7 +34861,7 @@ oX
 vi
 ga
 gz
-Ho
+bU
 Mv
 Wj
 Sp
@@ -33179,7 +35010,7 @@ er
 Sp
 Sp
 yf
-wl
+na
 iB
 EG
 cq
@@ -33208,7 +35039,7 @@ Yk
 Xu
 TM
 hF
-Yk
+KS
 OO
 PA
 OO
@@ -33216,8 +35047,8 @@ Ul
 LN
 fl
 aP
-Lf
-Hv
+WP
+lu
 Jc
 qv
 ra
@@ -33381,8 +35212,8 @@ er
 Sp
 Sp
 yf
-wl
-iB
+Bo
+CT
 EG
 MP
 yl
@@ -33636,7 +35467,7 @@ cl
 Mk
 vE
 gz
-Ho
+Qk
 cL
 Wj
 qG
@@ -33786,8 +35617,8 @@ Sp
 Lz
 yf
 wl
-iB
-Vt
+CT
+Bm
 HQ
 SZ
 SD
@@ -33800,7 +35631,7 @@ zZ
 nJ
 Vt
 Vt
-Vt
+Bm
 iN
 Ik
 iN
@@ -33810,17 +35641,17 @@ mB
 Lf
 Lf
 Lf
-Lf
+QW
 Cs
 Cs
 Cs
 Lf
 Lf
+QW
 Lf
 Lf
 Lf
-Lf
-Lf
+WP
 Lf
 Lf
 mh
@@ -33838,8 +35669,8 @@ sM
 vi
 BW
 gz
-Ho
-cL
+rp
+OH
 Wj
 Sp
 Sp
@@ -34011,7 +35842,7 @@ Mu
 kJ
 RR
 iN
-IN
+pp
 IN
 IN
 IN
@@ -34025,7 +35856,7 @@ pf
 UB
 mk
 Zl
-Hv
+EA
 FF
 ln
 Sg
@@ -34232,9 +36063,9 @@ ft
 gz
 gz
 gz
+hf
 gz
-gz
-gz
+Kr
 gz
 gz
 QC
@@ -34243,7 +36074,7 @@ QC
 gz
 gz
 Ho
-cL
+RS
 Wj
 Sp
 Sp
@@ -34391,10 +36222,10 @@ qG
 qG
 qG
 yf
-wl
-iB
+qX
+zq
 Vt
-Mo
+Dg
 yC
 BE
 MB
@@ -34429,14 +36260,14 @@ Ta
 wo
 hS
 Zl
-iT
+nL
 fQ
 Ai
 Fd
 uP
 ya
 aX
-aX
+Tv
 Ai
 ZZ
 ZZ
@@ -34444,8 +36275,8 @@ yL
 ZZ
 ZZ
 Wj
-Ho
-cL
+Jy
+OH
 Wj
 qG
 qG
@@ -34594,7 +36425,7 @@ Sp
 Lz
 yf
 AB
-iB
+CT
 Vt
 KX
 Vt
@@ -34795,7 +36626,7 @@ er
 Sp
 Sp
 yf
-wl
+TG
 iB
 Vt
 Ps
@@ -34827,7 +36658,7 @@ GS
 IN
 En
 YP
-CP
+Za
 rm
 My
 NO
@@ -35012,7 +36843,7 @@ xA
 Zx
 Vt
 Vt
-Vt
+Gn
 iN
 Yf
 iN
@@ -35050,7 +36881,7 @@ Jp
 ZZ
 ZZ
 Wj
-Ho
+jY
 cL
 Wj
 Sp
@@ -35199,23 +37030,23 @@ qG
 qG
 qG
 yf
-wl
-iB
+Bo
+tH
 Vt
 QB
 Xk
 Ji
 wj
 wj
-UC
+Tw
 UC
 Hd
 tV
 OR
 kP
 rZ
-zM
-XD
+oV
+Kf
 ZM
 UZ
 UZ
@@ -35230,7 +37061,7 @@ NJ
 aS
 IN
 IN
-YP
+je
 XT
 CP
 uC
@@ -35252,7 +37083,7 @@ ZZ
 ZZ
 ZZ
 Wj
-Ho
+WO
 cL
 Wj
 qG
@@ -35401,7 +37232,7 @@ er
 Sp
 Lz
 yf
-uU
+Ur
 TB
 yk
 qu
@@ -35439,7 +37270,7 @@ pw
 CP
 Pt
 oR
-iT
+zJ
 Ai
 aX
 PM
@@ -35454,7 +37285,7 @@ ZZ
 ZZ
 ZZ
 Wj
-Ho
+bQ
 cL
 Wj
 Sp
@@ -35603,7 +37434,7 @@ er
 Sp
 Sp
 yf
-lW
+Tr
 qZ
 Qs
 HM
@@ -35656,7 +37487,7 @@ ZZ
 ZZ
 ZZ
 Wj
-Ho
+rp
 cL
 Wj
 Sp
@@ -35823,14 +37654,14 @@ EF
 Ig
 Wm
 tu
-GO
+MF
 GO
 hx
 pk
 GO
+UP
 GO
-GO
-GO
+nU
 lU
 oY
 jC
@@ -35859,7 +37690,7 @@ EZ
 EZ
 Wj
 Ho
-cL
+Rk
 Wj
 Ju
 Ju
@@ -36008,7 +37839,7 @@ yf
 yf
 yf
 yf
-MN
+af
 dd
 jq
 xp
@@ -36022,7 +37853,7 @@ dd
 pa
 mA
 GV
-Ig
+TF
 yo
 Lm
 GO
@@ -36032,7 +37863,7 @@ Gp
 fg
 ew
 OS
-GO
+rQ
 Bn
 ih
 AG
@@ -36049,16 +37880,16 @@ hi
 mK
 Vy
 Vy
-Vy
+Xx
 Wt
 Vy
 Vy
 mK
 rt
+TT
 ni
-ni
-ni
-ni
+fR
+Pi
 aB
 Ho
 dm
@@ -36610,7 +38441,7 @@ fh
 fh
 fh
 SA
-ks
+HI
 gC
 ks
 ks
@@ -36649,20 +38480,20 @@ oh
 UJ
 bj
 so
-nY
-oR
+Dy
+Zd
 iT
 Ke
 gL
 ua
+ls
 ua
 ua
-ua
-Vy
+xV
 Ke
 SK
 ni
-ni
+fR
 EZ
 EZ
 EZ
@@ -36852,18 +38683,18 @@ Zp
 ds
 nh
 nY
-oR
+ah
 iT
 mK
 LF
 LS
 Ua
 uJ
-uJ
+Hw
 uJ
 TI
 nd
-ni
+Wo
 EZ
 EZ
 EZ
@@ -37054,13 +38885,13 @@ Tn
 TO
 Yu
 nY
-oR
+VK
 iT
 yQ
+Kh
 yQ
 yQ
-yQ
-yQ
+DC
 yQ
 Ke
 Ke
@@ -37254,9 +39085,9 @@ JE
 ME
 Rq
 PQ
-so
+iP
 nY
-oR
+SV
 cB
 Mh
 vb
@@ -37266,7 +39097,7 @@ vN
 vN
 Mh
 Pe
-wb
+vv
 EZ
 EZ
 dR
@@ -37456,10 +39287,10 @@ XC
 so
 tt
 so
-so
+rd
 nY
 oR
-iT
+sI
 Mh
 HP
 nR
@@ -37669,7 +39500,7 @@ BT
 ML
 nC
 Mh
-XG
+Wo
 EZ
 EZ
 dR
@@ -37861,15 +39692,15 @@ so
 Kn
 Kx
 ca
-nY
+Mp
 oR
 iT
 Mh
+AP
 vN
 vN
 vN
-vN
-vN
+Gk
 Mh
 EZ
 EZ
@@ -38065,12 +39896,12 @@ Kx
 Rx
 nY
 sN
-iT
+TJ
 Mh
 Kz
 vN
 Vg
-vN
+Yc
 vN
 Mh
 EZ
@@ -38273,7 +40104,7 @@ Mh
 Mh
 Mh
 Mh
-Mh
+HB
 Mh
 rA
 xk
@@ -38460,14 +40291,14 @@ GO
 qY
 yU
 jE
-nY
+Le
 vp
 vp
 nY
 nY
 vU
 XZ
-XZ
+cH
 qq
 tM
 jr
@@ -38649,7 +40480,7 @@ ZK
 Sk
 ps
 kr
-go
+Mr
 Fv
 gg
 UQ
@@ -38657,7 +40488,7 @@ kc
 gD
 hO
 DL
-DL
+Yr
 DL
 qr
 MZ
@@ -38846,7 +40677,7 @@ wB
 dd
 dd
 dd
-dd
+fL
 dd
 dd
 dd
@@ -38871,16 +40702,16 @@ Gr
 gs
 QI
 rq
-Wp
-Wp
+wm
+iK
 Wp
 Wp
 Wp
 ke
 tl
-kW
+MJ
 Nk
-vo
+Kd
 rA
 xk
 xk
@@ -39055,9 +40886,9 @@ Xg
 Xg
 Xg
 Xg
-cj
+lN
 ei
-ay
+tO
 pF
 dl
 Yw
@@ -39067,7 +40898,7 @@ cs
 cW
 PC
 Yw
-Yw
+aQ
 Yw
 ax
 pF
@@ -39075,7 +40906,7 @@ KQ
 dO
 Wp
 iZ
-iZ
+qE
 iZ
 Wp
 Zh
@@ -39258,10 +41089,10 @@ cj
 cj
 Xg
 cj
-ZM
-iL
-pF
+sq
+px
 pF
+cF
 AX
 AX
 AX
@@ -39272,9 +41103,9 @@ AX
 AX
 AX
 pF
-pF
-oR
-iT
+Am
+bM
+Sv
 Wp
 xP
 wW
@@ -39284,7 +41115,7 @@ al
 yq
 cR
 Nk
-vo
+Kd
 rA
 xk
 xk
@@ -39460,8 +41291,8 @@ SH
 cj
 uW
 cj
-ZM
-iL
+nq
+px
 Ku
 At
 zc
@@ -39475,16 +41306,16 @@ bZ
 en
 HG
 Ku
-oR
-iT
+bM
+ZC
 Wp
 eB
 YU
 Fc
-Wp
-Nk
-um
+wm
+SW
 um
+NN
 Nk
 vo
 rA
@@ -39654,16 +41485,16 @@ cj
 Xg
 cj
 LC
-Ag
 Me
 Me
-Ag
+Me
+Me
 ws
 cj
 Xg
 cj
-ZM
-iL
+aa
+px
 Ku
 GK
 GK
@@ -39677,16 +41508,16 @@ WE
 uG
 DK
 Ku
-oR
-iT
+bM
+Sv
 Wp
 JF
 zd
 Om
 Wp
 qJ
-um
-um
+CI
+Jj
 Nk
 th
 nj
@@ -39865,7 +41696,7 @@ cj
 Xg
 cj
 VV
-iL
+px
 FZ
 GK
 GK
@@ -39886,7 +41717,7 @@ bI
 sB
 Ge
 Wp
-Nk
+zP
 Wz
 zk
 Nk
@@ -40064,13 +41895,13 @@ cj
 cj
 Lg
 cj
-cj
+GL
 cj
 LP
-Ru
+ck
 bN
 Dp
-Dp
+ST
 ER
 iH
 WE
@@ -40081,17 +41912,17 @@ WE
 GK
 IJ
 Ku
-oR
-iT
+bM
+Sv
 lL
 lL
 zz
 NP
 lL
 lL
+TE
 lL
-lL
-lL
+XY
 Tt
 Tt
 Tt
@@ -40269,7 +42100,7 @@ JA
 KK
 cj
 xS
-iL
+px
 Ku
 yx
 VM
@@ -40283,8 +42114,8 @@ FI
 wA
 If
 Ku
-oR
-iT
+bM
+Sv
 lL
 qL
 ly
@@ -40292,7 +42123,7 @@ Qm
 hY
 zn
 sj
-Oa
+Rl
 Oa
 jO
 BI
@@ -40470,15 +42301,15 @@ Or
 rL
 ij
 HO
-ZM
-iL
-lP
+nq
+px
 lP
 lP
 lP
 lP
 lP
 lP
+pn
 lP
 lP
 lP
@@ -40672,14 +42503,14 @@ VE
 Gb
 Kg
 HO
-ZM
-iL
+nq
+px
 wz
 yz
 yz
 yz
 yz
-yz
+Ld
 yz
 yz
 yz
@@ -40687,7 +42518,7 @@ yz
 yz
 yz
 wz
-Vk
+sC
 Lt
 tY
 CO
@@ -40873,8 +42704,8 @@ cj
 Lw
 Vq
 CZ
-cj
-ZM
+Ys
+nq
 Qv
 wz
 yz
@@ -40888,9 +42719,9 @@ wz
 wz
 wz
 yz
-wz
-oR
-iT
+Rd
+bM
+Sv
 tY
 CO
 io
@@ -41076,8 +42907,8 @@ gb
 ar
 oK
 Vm
-UV
-iL
+kv
+px
 wz
 yz
 wz
@@ -41091,8 +42922,8 @@ jg
 wz
 yz
 wz
-oR
-iT
+UI
+Sv
 EC
 OE
 rh
@@ -41293,8 +43124,8 @@ Ux
 wz
 yz
 wz
-oR
-iT
+zr
+Sv
 Tt
 YA
 VL
@@ -41480,10 +43311,10 @@ qf
 Ic
 Pu
 Un
-Pd
-rI
+bG
+Gz
 wz
-yz
+Gy
 wz
 KT
 Ks
@@ -41493,10 +43324,10 @@ OQ
 HJ
 qD
 wz
-yz
+XR
 ss
-oR
-iT
+bM
+Sv
 Tt
 vR
 VL
@@ -41680,10 +43511,10 @@ rW
 Fn
 Qy
 nw
-TU
+kq
 dt
-ZM
-iL
+nq
+px
 wz
 yz
 wz
@@ -41889,7 +43720,7 @@ JL
 wz
 yz
 wz
-Yn
+Uy
 KL
 wz
 Ij
@@ -41900,7 +43731,7 @@ wz
 yz
 wz
 fF
-iT
+Sv
 oA
 fc
 VL
@@ -42085,9 +43916,9 @@ jP
 OM
 Wy
 TU
-Un
-ZM
-iL
+UE
+nq
+px
 wz
 yz
 wz
@@ -42101,8 +43932,8 @@ FA
 wz
 yz
 wz
-oR
-iT
+bM
+Sv
 Tt
 mC
 sk
@@ -42287,9 +44118,9 @@ jP
 gI
 Wy
 TU
-Un
-ZM
-iL
+qo
+nq
+px
 wz
 yz
 wz
@@ -42302,9 +44133,9 @@ qD
 jg
 wz
 yz
-wz
-oR
-cB
+jz
+bM
+Fi
 Tt
 vX
 hn
@@ -42316,7 +44147,7 @@ VD
 kK
 qn
 Tt
-bB
+JG
 eL
 Id
 VF
@@ -42496,16 +44327,16 @@ dx
 dx
 dx
 GT
-GT
+EP
 GT
 LT
 GT
+EP
 GT
-GT
-ch
-ch
-ch
-KQ
+Yd
+Yd
+Yd
+Vf
 Ed
 PF
 AW
@@ -42682,7 +44513,7 @@ Ap
 rW
 to
 rW
-rW
+QX
 bn
 rW
 wK
@@ -42692,9 +44523,9 @@ bA
 Cf
 pR
 Cf
-ZM
-ur
-Cl
+bP
+Qf
+Rv
 XD
 dx
 vL
@@ -42704,11 +44535,11 @@ Gi
 mL
 IL
 vL
-ch
-vU
-XZ
-qq
-iT
+dU
+rG
+PG
+Bt
+sW
 rD
 Nn
 QP
@@ -42723,7 +44554,7 @@ Tt
 bB
 rn
 nr
-fu
+VF
 fh
 fh
 fh
@@ -42894,10 +44725,10 @@ Fx
 Eu
 gf
 Zf
-Fv
-gg
+Qw
+Ph
 Wv
-iL
+pS
 dx
 GT
 IL
@@ -42906,13 +44737,13 @@ WS
 kU
 IL
 GT
-ch
-oR
-vd
+Yd
+Jm
+au
 GG
 EQ
 gt
-gt
+Hq
 gt
 gt
 Bl
@@ -43098,7 +44929,7 @@ MS
 Nv
 Nv
 bf
-xS
+Ec
 Rw
 zv
 GT
@@ -43109,18 +44940,18 @@ mL
 Ub
 GT
 YV
-oR
-iT
-gt
+Jm
+sW
 gt
 gt
+gk
 Po
 ho
 TD
 FY
 Vv
 VZ
-Vv
+Fp
 bJ
 Ng
 XB
@@ -43300,8 +45131,8 @@ zT
 cT
 hb
 bf
-ZM
-iL
+ZO
+pS
 dx
 GT
 Jl
@@ -43310,11 +45141,11 @@ Gi
 mL
 gO
 GT
-ch
-oR
-iT
+Yd
+Jm
+sW
 gt
-cE
+Wb
 NX
 lf
 Ob
@@ -43499,11 +45330,11 @@ my
 dq
 IH
 qR
-Nv
+qb
 Nv
 bf
-Aj
-iL
+kE
+pS
 dx
 vL
 Ip
@@ -43512,7 +45343,7 @@ Gi
 mL
 Ip
 vL
-ch
+Yd
 nl
 bH
 gt
@@ -43704,8 +45535,8 @@ CJ
 cT
 Gd
 bf
-ZM
-iL
+MX
+pS
 dx
 GT
 se
@@ -43714,9 +45545,9 @@ eF
 kU
 AR
 GT
-ch
-Vk
-hi
+Yd
+Ok
+eZ
 gt
 Rg
 Pr
@@ -43902,12 +45733,12 @@ HW
 Ws
 ok
 IH
-CJ
-Nv
+ug
+Xf
 Nv
 bf
-ZM
-iL
+ZO
+pS
 zv
 GT
 qx
@@ -43917,8 +45748,8 @@ mL
 eP
 GT
 YV
-oR
-iT
+Jm
+sW
 Lb
 Po
 Pr
@@ -44108,8 +45939,8 @@ CJ
 cT
 Gd
 bf
-ZM
-iL
+ZO
+pS
 dx
 GT
 ov
@@ -44118,9 +45949,9 @@ xM
 gr
 KY
 GT
-ch
-oR
-iT
+Yd
+Jm
+sW
 Lb
 VN
 Pr
@@ -44297,7 +46128,7 @@ Id
 cK
 KV
 KV
-Jn
+oo
 Jn
 Jn
 LE
@@ -44306,12 +46137,12 @@ Fx
 Fx
 rN
 co
-CJ
+Hc
 Nv
 Nv
 bf
-xS
-iL
+fz
+pS
 dx
 vL
 it
@@ -44320,9 +46151,9 @@ Jb
 mL
 it
 vL
-ch
+Yd
 op
-iT
+sW
 Lb
 Po
 Pr
@@ -44332,7 +46163,7 @@ SB
 du
 du
 Po
-Po
+oG
 Po
 Hn
 mx
@@ -44512,8 +46343,8 @@ CJ
 VX
 le
 bf
-Aj
-iL
+kE
+pS
 dx
 GT
 fT
@@ -44522,8 +46353,8 @@ To
 mL
 eC
 GT
-ch
-oR
+dv
+Jm
 jF
 gt
 zh
@@ -44701,7 +46532,7 @@ Id
 cK
 PP
 PP
-RD
+HC
 vm
 vm
 Sy
@@ -44713,9 +46544,9 @@ tA
 ND
 Nv
 Nv
-bf
-ZM
-iL
+Iy
+ZO
+pS
 YK
 YK
 FJ
@@ -44725,7 +46556,7 @@ Nb
 wa
 Nb
 Nb
-oR
+Jm
 WM
 Nd
 ZE
@@ -44917,8 +46748,8 @@ Wd
 vl
 bf
 Sh
-iL
-YK
+pS
+MA
 KW
 YD
 YK
@@ -44926,9 +46757,9 @@ su
 Nb
 Dt
 Ev
-Nb
-oR
-iT
+gE
+Jm
+sW
 gt
 iy
 Hr
@@ -45101,11 +46932,11 @@ fh
 fh
 fh
 CK
-lV
-PP
+Id
 PP
 PP
 PP
+uV
 qz
 Sn
 wQ
@@ -45113,7 +46944,7 @@ tc
 MQ
 hI
 FN
-Kl
+jv
 hX
 TQ
 wu
@@ -45129,8 +46960,8 @@ Nb
 Dt
 gv
 Nb
-oR
-iT
+Jm
+sW
 gt
 os
 Po
@@ -45310,7 +47141,7 @@ tN
 SQ
 Pw
 RD
-PP
+Ud
 nM
 PP
 NY
@@ -45331,12 +47162,12 @@ EV
 UM
 Kj
 DE
-oR
-cB
+Jm
+lO
 gt
 sc
 cE
-Po
+RG
 QL
 kG
 Po
@@ -45523,20 +47354,20 @@ Nv
 Nv
 bf
 Aj
-iL
+pS
 YK
 qF
 Md
-YK
+MA
 Np
 Nb
 Fl
 lM
-Nb
-oR
-iT
-gt
+RH
+Jm
+sW
 gt
+DT
 gt
 gt
 Fz
@@ -45719,13 +47550,13 @@ RJ
 PP
 zU
 PP
-PP
+uV
 vh
 nQ
-gg
-gg
+Ql
+Ph
 sF
-iL
+pS
 YK
 pO
 Nx
@@ -45735,12 +47566,12 @@ Nb
 eW
 Rc
 Nb
-oR
+Jm
 AM
 MH
 MH
 gN
-bz
+mn
 dC
 EB
 Ma
@@ -45749,7 +47580,7 @@ CE
 tZ
 sR
 lK
-Bj
+VH
 Ki
 rA
 xk
@@ -45923,15 +47754,15 @@ hI
 hI
 PP
 SP
-qU
-zM
-zM
-zM
-wk
+BD
+kM
+kM
+kM
+cI
 YK
 LK
 BX
-YK
+PU
 uo
 Nb
 Ev
@@ -46125,7 +47956,7 @@ hI
 at
 PP
 fp
-Lm
+qQ
 bf
 bf
 bf
@@ -46140,11 +47971,11 @@ Nb
 Nb
 Nb
 Zz
-Zz
+sJ
 Zz
 Zz
 li
-KQ
+Vf
 Fz
 dC
 mi
@@ -46316,7 +48147,7 @@ VF
 Yy
 cK
 PP
-PP
+Ud
 hI
 hI
 qi
@@ -46325,27 +48156,27 @@ hI
 hI
 hI
 ES
-PP
+Ud
 Ba
-qU
+NC
 uX
 Km
 KB
-KB
+jR
 KB
 KB
 dz
 Km
 Fq
 dW
-KB
+jR
 Km
 KB
 KB
 KB
 dz
 up
-vH
+xj
 lS
 ma
 PH
@@ -46528,7 +48359,7 @@ hI
 hI
 rR
 PP
-go
+Oq
 Cv
 xt
 yP
@@ -46558,7 +48389,7 @@ CD
 ef
 nK
 dk
-Ki
+Mn
 ae
 eL
 Id
@@ -46737,13 +48568,13 @@ kx
 cO
 Go
 uq
+Rn
 cO
 cO
-cO
-ot
-cO
+ZN
 cO
 cO
+Rn
 uq
 Go
 cO
@@ -46936,16 +48767,16 @@ ig
 kD
 GB
 Uv
+vW
 nP
+hA
 nP
-nP
-nP
-nP
+ZU
 cO
 la
 fm
 qT
-qT
+GQ
 qT
 qT
 qT
@@ -46956,7 +48787,7 @@ Xd
 ae
 tL
 xO
-gH
+ab
 gH
 uQ
 uQ
@@ -47143,23 +48974,23 @@ TH
 jw
 xa
 nP
-cO
+JC
 ot
 cO
 aY
 VO
 Ez
-VO
+jo
 CA
 aj
 GB
-dw
+qN
 BB
 ae
 PN
 nu
 NF
-yj
+Ca
 Ac
 Ac
 IM
@@ -47354,7 +49185,7 @@ TC
 YW
 aW
 dL
-qT
+GD
 qT
 qT
 ae
@@ -47749,7 +49580,7 @@ wn
 nP
 za
 za
-za
+fC
 cY
 za
 qT
@@ -47769,7 +49600,7 @@ yj
 Ac
 IM
 iz
-iz
+Qb
 ae
 ae
 eL
@@ -47948,7 +49779,7 @@ nP
 nP
 QS
 QQ
-nP
+yG
 Eo
 YE
 pH
@@ -48166,8 +49997,8 @@ tC
 tC
 SL
 ae
-ae
-xO
+xW
+Qc
 RP
 We
 ue
@@ -48363,7 +50194,7 @@ mQ
 qT
 pB
 iY
-qT
+Mw
 Vd
 Vd
 Vd
@@ -48773,7 +50604,7 @@ Vd
 Vd
 ae
 ae
-xO
+SJ
 QF
 iz
 QF
@@ -48980,7 +50811,7 @@ Aa
 We
 Oj
 QF
-iz
+UU
 ae
 ae
 eL
@@ -49168,7 +50999,7 @@ Wx
 Rj
 sz
 LL
-qT
+Zm
 qT
 qT
 qT
@@ -49548,8 +51379,8 @@ fh
 fh
 fh
 wB
-bB
-bB
+Db
+Db
 DV
 wV
 wV
@@ -49561,7 +51392,7 @@ si
 bB
 bB
 bB
-YX
+ag
 nT
 nk
 Sz
@@ -49575,7 +51406,7 @@ Sz
 Sz
 YN
 nT
-YX
+ag
 bB
 bB
 bB