diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm
index 6fbf807f718..52375299fc5 100644
--- a/_maps/map_files/vonneumann/vnmk3.dmm
+++ b/_maps/map_files/vonneumann/vnmk3.dmm
@@ -132,6 +132,10 @@
 /obj/effect/turf_decal/guideline/guideline_mid/purple,
 /turf/open/floor/carpet/ship,
 /area/hallway/upper/primary/starboard)
+"afI" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "afJ" = (
 /obj/machinery/door/airlock/ship/external{
 	name = "Escape Pod"
@@ -254,6 +258,16 @@
 /obj/effect/overlay/poolwater,
 /turf/open/indestructible/sound/pool/spentfuel/wall,
 /area/engine/engineering/reactor_control)
+"anB" = (
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/machinery/status_display/supply/west,
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "aof" = (
 /obj/effect/turf_decal/tile/blue/flat_side,
 /obj/machinery/computer/crew{
@@ -455,6 +469,18 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"auO" = (
+/obj/structure/sign/departments/cargo{
+	pixel_x = -31
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "auR" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -666,13 +692,17 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "aCp" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/light{
-	dir = 4
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 8
 	},
-/obj/structure/ore_box,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/caution/red,
+/obj/machinery/ship_weapon/torpedo_launcher/cargo/east,
+/obj/machinery/status_display/supply/south,
 /turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/area/cargo/lobby)
 "aCw" = (
 /obj/machinery/light/floor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1118,6 +1148,12 @@
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"aUr" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/monofloor/airless,
+/area/nsv/hanger/mining)
 "aUT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1225,6 +1261,13 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/upper/primary/port)
+"aWP" = (
+/obj/structure/showcase/mecha/marauder{
+	name = "marauder";
+	desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations. This one is made of cardboard"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "aXJ" = (
 /obj/machinery/power/smes,
 /obj/structure/cable{
@@ -1416,6 +1459,12 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/maintenance/nsv/ftlroom)
+"bfq" = (
+/obj/machinery/computer/bounty{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "bfx" = (
 /obj/machinery/computer/ship/viewscreen,
 /obj/machinery/camera/autoname,
@@ -2067,18 +2116,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering/reactor_control)
-"bCa" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 4
-	},
-/obj/structure/sign/departments/minsky/supply/mining{
-	pixel_y = 31
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "bCs" = (
 /obj/structure/chair/fancy/shuttle,
 /obj/structure/window{
@@ -2359,6 +2396,9 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/port)
+"bJp" = (
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
 "bJV" = (
 /obj/effect/landmark/start/bridge,
 /obj/structure/chair/fancy/shuttle{
@@ -2672,12 +2712,6 @@
 	},
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai_upload)
-"cbI" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "cbQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -2693,22 +2727,6 @@
 	},
 /turf/open/floor/engine/airless,
 /area/nsv/hanger)
-"ccN" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-8";
-	tag = ""
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
 "cdO" = (
 /obj/machinery/computer/rdconsole/production{
 	dir = 8
@@ -3774,25 +3792,6 @@
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
-"cUB" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
-	},
-/obj/machinery/camera/autoname{
-	dir = 5
-	},
-/obj/structure/sign/poster/contraband/bountyhunters{
-	pixel_x = -32
-	},
-/obj/machinery/light_switch/west{
-	pixel_x = -18
-	},
-/obj/item/clothing/head/cone{
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "cUS" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer4{
 	dir = 8
@@ -4165,6 +4164,10 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
+"dnl" = (
+/obj/structure/ore_box,
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "dnB" = (
 /obj/machinery/door/airlock/ship/maintenance{
 	dir = 4;
@@ -4540,15 +4543,6 @@
 	},
 /turf/open/floor/circuit,
 /area/bridge/cic)
-"dEh" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/item/clothing/head/cone{
-	pixel_x = -6
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "dEs" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -5000,6 +4994,18 @@
 "dSh" = (
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"dSt" = (
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 4
+	},
+/obj/structure/sign/departments/minsky/supply/mining{
+	pixel_y = 31
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "dSA" = (
 /obj/machinery/plantgenes,
 /obj/machinery/light{
@@ -5411,25 +5417,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
-"eqe" = (
-/obj/structure/table,
-/obj/machinery/status_display/supply/west,
-/obj/item/clipboard,
-/obj/item/pen/fountain,
-/obj/item/stamp/denied{
-	pixel_x = 6;
-	pixel_y = 7
-	},
-/obj/item/stamp{
-	pixel_x = -4;
-	pixel_y = 3
-	},
-/obj/item/stamp/quartermaster{
-	pixel_x = 2;
-	pixel_y = -1
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "eqf" = (
 /obj/structure/sign/ship/nosmoking{
 	pixel_y = 27
@@ -5507,17 +5494,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
-"est" = (
-/obj/docking_port/stationary{
-	dir = 2;
-	id = "supply_home";
-	name = "Von Neumann Cargo Bay";
-	dwidth = 11;
-	height = 22;
-	width = 22
-	},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
 "esD" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5831,16 +5807,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
-"eIA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/mineral/stacking_unit_console{
-	machinedir = 4;
-	pixel_y = -40
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
 "eIB" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/structure/window/reinforced,
@@ -6052,6 +6018,18 @@
 	},
 /turf/open/floor/engine/n2o,
 /area/engine/atmos/port_atmos)
+"eSt" = (
+/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 = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "eTq" = (
 /obj/machinery/keycard_auth,
 /obj/structure/table/glass/plasma,
@@ -6522,6 +6500,21 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"flS" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/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"
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "flT" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -7017,12 +7010,24 @@
 /turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "fAX" = (
-/obj/structure/sign/poster/contraband/random{
-	pixel_y = 32
+/obj/structure/table,
+/obj/machinery/status_display/supply/west,
+/obj/item/clipboard,
+/obj/item/pen/fountain,
+/obj/item/stamp/denied{
+	pixel_x = 6;
+	pixel_y = 7
 	},
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/item/stamp{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/obj/item/stamp/quartermaster{
+	pixel_x = 2;
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "fBb" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7189,6 +7194,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/lobby)
+"fHv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "fHN" = (
 /obj/effect/turf_decal/tile/blue/flat_side,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -8084,30 +8101,6 @@
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
-"gya" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 8
-	},
-/obj/machinery/navbeacon{
-	codes_txt = "delivery;dir=8";
-	location = "QM #2"
-	},
-/mob/living/simple_animal/bot/mulebot{
-	home_destination = "QM #2";
-	name = "Sisyphus";
-	suffix = "#3"
-	},
-/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 = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "gyk" = (
 /obj/machinery/computer/card/minor/ce{
 	dir = 8
@@ -8240,13 +8233,13 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/restrooms)
 "gFg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/light{
+	dir = 4
 	},
+/obj/structure/ore_box,
 /turf/open/floor/plasteel,
-/area/cargo/lobby)
+/area/quartermaster/miningoffice)
 "gFu" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -8489,30 +8482,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering/reactor_control)
-"gMY" = (
-/obj/machinery/door/airlock/ship/station/mining/glass{
-	name = "Quartermaster Office";
-	req_access_txt = "41";
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/landmark/zebra_interlock_point,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "gNi" = (
 /obj/machinery/squad_vendor,
 /turf/closed/wall/ship,
@@ -8669,6 +8638,29 @@
 /obj/effect/landmark/zebra_interlock_point,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
+"gQP" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/landmark/patrol_node{
+	next_id = list("science","engineering","evac","munitions");
+	name = "Cargo patrol node";
+	id = "cargo"
+	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/carpet/ship,
+/area/hallway/nsv/deck1/frame2/starboard)
 "gRi" = (
 /turf/closed/wall/ship,
 /area/hallway/upper/primary/starboard)
@@ -9209,9 +9201,17 @@
 /turf/open/floor/carpet/ship,
 /area/security)
 "hmz" = (
-/obj/structure/rack,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/structure/closet/secure_closet/quartermaster,
+/obj/item/storage/box/fountainpens,
+/obj/item/storage/lockbox/medal/cargo,
+/obj/machinery/light_switch/west{
+	pixel_x = -19
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "hmG" = (
 /obj/machinery/ai_slipper,
 /obj/structure/cable{
@@ -9543,20 +9543,6 @@
 /obj/machinery/recharge_station,
 /turf/open/floor/plasteel,
 /area/science/lobby)
-"hzm" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/power/apc/auto_name/south,
-/obj/structure/cable{
-	icon_state = "0-4";
-	pixel_x = -1
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "hzn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -9745,10 +9731,7 @@
 	},
 /area/maintenance/port/aft)
 "hJH" = (
-/obj/structure/showcase/mecha/marauder{
-	name = "marauder";
-	desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations. This one is made of cardboard"
-	},
+/obj/structure/rack,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "hJR" = (
@@ -9941,10 +9924,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/restrooms)
-"hQo" = (
-/mob/living/simple_animal/sloth/paperwork,
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "hSr" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
@@ -10453,9 +10432,14 @@
 /turf/open/floor/carpet/ship,
 /area/hallway/secondary/service)
 "ipo" = (
-/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/door/poddoor/ship{
+	dir = 1;
+	id = "atlas_mining_hangar"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/caution/stand_clear/red,
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "ipq" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -10486,6 +10470,10 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/circuit/green/anim,
 /area/engine/engineering/reactor_control)
+"ira" = (
+/mob/living/simple_animal/sloth/paperwork,
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "irv" = (
 /obj/structure/closet/crate/engineering,
 /obj/item/stack/sheet/rglass{
@@ -10593,11 +10581,29 @@
 /turf/open/floor/plasteel,
 /area/science/lobby)
 "ixa" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
+/obj/machinery/door/airlock/ship/station/mining/glass{
+	name = "Quartermaster Office";
+	req_access_txt = "41";
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
-/area/cargo/lobby)
+/area/quartermaster/qm)
 "ixw" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -10794,16 +10800,6 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/crew_quarters/heads/chief)
-"iDc" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
-	},
-/obj/machinery/camera/autoname{
-	dir = 5
-	},
-/obj/machinery/status_display/supply/west,
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "iDr" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/glowstick/lit,
@@ -11424,6 +11420,22 @@
 /obj/item/extinguisher/advanced/hull_repair_juice,
 /turf/open/floor/plating,
 /area/maintenance/central)
+"iWz" = (
+/obj/machinery/door/airlock/ship/station/mining{
+	name = "Cargo Bay";
+	req_one_access_txt = "31; 48"
+	},
+/obj/effect/landmark/zebra_interlock_point,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
 "iWR" = (
 /obj/machinery/light,
 /obj/machinery/telecomms/receiver/preset_left,
@@ -11724,12 +11736,6 @@
 	},
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
-"jkE" = (
-/obj/machinery/computer/bounty{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "jkF" = (
 /obj/machinery/computer/ship/ordnance{
 	dir = 8
@@ -12166,18 +12172,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
-"jDP" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/stamp/denied,
-/obj/item/stamp,
-/obj/item/clothing/ears/earmuffs,
-/obj/item/clothing/ears/earmuffs,
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "jDY" = (
 /obj/machinery/processor/slime,
 /turf/open/floor/durasteel/techfloor_grid,
@@ -12702,12 +12696,33 @@
 /obj/effect/spawner/lootdrop/crate_spawner,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"jXO" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8";
+	tag = ""
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
 "jXU" = (
 /obj/machinery/atmospherics/components/binary/circulator/cold{
 	dir = 8
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
+"jYi" = (
+/obj/structure/falsewall/duranium,
+/obj/effect/spawner/lootdrop/trap,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "jYu" = (
 /obj/structure/window/reinforced/spawner,
 /obj/structure/cable{
@@ -12817,21 +12832,12 @@
 /turf/open/space/basic,
 /area/space/nearstation)
 "keT" = (
-/obj/machinery/door/airlock/ship/station/mining{
-	name = "Cargo Bay";
-	req_one_access_txt = "31; 48"
-	},
-/obj/effect/landmark/zebra_interlock_point,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/rnd/production/techfab/department/cargo,
 /turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
+/area/cargo/lobby)
 "kfi" = (
 /obj/machinery/door/airlock/ship/command{
 	name = "Master At Arms";
@@ -12895,7 +12901,6 @@
 /turf/open/floor/engine,
 /area/engine/shield_generator)
 "kiz" = (
-/obj/effect/landmark/start/cargo_technician,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
@@ -13152,14 +13157,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
-"kql" = (
-/obj/structure/table,
-/obj/machinery/airalarm/directional/south,
-/obj/item/computer_hardware/hard_drive/role/quartermaster,
-/obj/item/camera,
-/obj/item/clothing/ears/earmuffs,
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "kqF" = (
 /obj/structure/table/glass,
 /obj/item/storage/firstaid/brute{
@@ -13259,13 +13256,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
-"kwt" = (
-/obj/effect/landmark/start/quartermaster,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "kwy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -13380,8 +13370,9 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "kAp" = (
-/obj/structure/falsewall/duranium,
-/obj/effect/spawner/lootdrop/trap,
+/obj/machinery/door/airlock/ship/maintenance{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "kAy" = (
@@ -13510,6 +13501,25 @@
 /obj/machinery/light_switch/west,
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/storage_shared)
+"kFi" = (
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/structure/sign/poster/contraband/bountyhunters{
+	pixel_x = -32
+	},
+/obj/machinery/light_switch/west{
+	pixel_x = -18
+	},
+/obj/item/clothing/head/cone{
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "kFl" = (
 /obj/machinery/light{
 	dir = 1
@@ -14469,18 +14479,6 @@
 	},
 /turf/open/indestructible/sound/pool/spentfuel,
 /area/engine/engineering/reactor_control)
-"lvi" = (
-/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 = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "lvY" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -14517,15 +14515,6 @@
 /obj/machinery/light_switch/north,
 /turf/open/floor/durasteel/techfloor_grid,
 /area/nsv/hanger/notkmcstupidhanger/pilot)
-"lxx" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 8
-	},
-/obj/machinery/computer/rdconsole/production{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "lxz" = (
 /obj/effect/landmark/start/chief_medical_officer,
 /obj/effect/landmark/event_spawn,
@@ -15614,6 +15603,15 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/maintenance/nsv/ftlroom)
+"mvz" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/item/clothing/head/cone{
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "mww" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
@@ -16465,17 +16463,9 @@
 /turf/open/space/basic,
 /area/ai_monitored/security/armory)
 "nov" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/ai_monitored/nuke_storage)
 "noD" = (
 /obj/machinery/computer/atmos_control/tank/toxin_tank{
 	dir = 4
@@ -17054,6 +17044,30 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/xo)
+"nQq" = (
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 8
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "delivery;dir=8";
+	location = "QM #2"
+	},
+/mob/living/simple_animal/bot/mulebot{
+	home_destination = "QM #2";
+	name = "Sisyphus";
+	suffix = "#3"
+	},
+/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 = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "nQB" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /obj/machinery/camera/autoname{
@@ -17539,18 +17553,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering/reactor_control)
-"ojx" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/caution/red,
-/obj/machinery/ship_weapon/torpedo_launcher/cargo/east,
-/obj/machinery/status_display/supply/south,
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "ojC" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -17726,6 +17728,10 @@
 	},
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
+"ouj" = (
+/obj/item/poster/random_contraband,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "ouR" = (
 /obj/machinery/computer/rdconsole/core,
 /obj/structure/sign/solgov_flag/right{
@@ -18245,6 +18251,18 @@
 /obj/machinery/replicator,
 /turf/closed/wall/ship,
 /area/crew_quarters/dorms)
+"oXu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "oXI" = (
 /obj/structure/table/glass,
 /obj/item/storage/firstaid/fire{
@@ -18595,10 +18613,10 @@
 /area/nsv/weapons/fore)
 "pmI" = (
 /obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
+	dir = 8
 	},
-/obj/item/clothing/head/cone{
-	pixel_x = 2
+/obj/machinery/computer/rdconsole/production{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
@@ -18766,12 +18784,6 @@
 /obj/item/binoculars,
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/security/armory)
-"psP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
 "ptp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -19182,8 +19194,11 @@
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/robotics)
 "pIY" = (
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "pJj" = (
 /obj/structure/grille/broken,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -19388,6 +19403,22 @@
 /obj/item/camera/detective,
 /turf/open/floor/carpet/ship/red_carpet,
 /area/security/detectives_office)
+"pWy" = (
+/obj/machinery/door/airlock/ship/external/glass{
+	dir = 4;
+	req_one_access_txt = "31;48;79"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "pXE" = (
 /turf/closed/wall/r_wall/ship,
 /area/engine/armour_pump)
@@ -19494,6 +19525,13 @@
 /obj/effect/landmark/start/clown,
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/restrooms)
+"qcB" = (
+/obj/effect/landmark/start/quartermaster,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "qcO" = (
 /obj/effect/turf_decal/tile/brown/tile_side,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -19865,13 +19903,6 @@
 	},
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/maintenance/nsv/ftlroom)
-"qqv" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
 "qqz" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -20384,23 +20415,19 @@
 /turf/open/floor/carpet/ship,
 /area/tcommsat/computer)
 "qOl" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
+/obj/machinery/advanced_airlock_controller/directional/north,
+/obj/machinery/light/small,
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "qQa" = (
 /obj/machinery/atmospherics/components/binary/magnetic_constrictor{
 	piping_layer = 2;
@@ -21142,6 +21169,21 @@
 	},
 /turf/open/floor/circuit/green/anim,
 /area/engine/engineering/reactor_control)
+"rDH" = (
+/obj/machinery/button/door{
+	id = "cargi";
+	name = "Cargo Doors";
+	pixel_y = -21
+	},
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 8
+	},
+/obj/item/banner/cargo,
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/caution/red,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "rDP" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -21462,6 +21504,13 @@
 	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
+"rSG" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "rTj" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/machinery/telecomms/server/presets/exploration,
@@ -21747,36 +21796,14 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
-"sjb" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
-	},
-/obj/machinery/computer/ship/viewscreen{
-	pixel_y = -5;
-	pixel_x = -32
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "sjc" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/door/airlock/ship/maintenance{
-	name = "Disposals Access";
-	req_one_access_txt = "12";
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/structure/table,
+/obj/machinery/airalarm/directional/south,
+/obj/item/computer_hardware/hard_drive/role/quartermaster,
+/obj/item/camera,
+/obj/item/clothing/ears/earmuffs,
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "sjO" = (
 /obj/effect/turf_decal/tile/purple/tile_side{
 	dir = 6
@@ -21931,8 +21958,13 @@
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/xenobiology)
 "sqP" = (
-/turf/open/space/basic,
-/area/maintenance/starboard/fore)
+/obj/structure/closet/secure_closet/miner,
+/obj/item/encryptionkey/pilot,
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
 "srf" = (
 /obj/machinery/ai_slipper{
 	uses = 10
@@ -22144,14 +22176,16 @@
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "sze" = (
-/obj/machinery/door/poddoor/ship{
-	dir = 1;
-	id = "atlas_mining_hangar"
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/caution/stand_clear/red,
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
+/obj/machinery/door/airlock/ship/maintenance{
+	name = "Disposals Access";
+	req_one_access_txt = "12";
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
 "sAd" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -22395,9 +22429,19 @@
 /turf/open/floor/engine,
 /area/storage/tech)
 "sKP" = (
-/obj/item/poster/random_contraband,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-4";
+	pixel_x = -1
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "sLy" = (
 /obj/machinery/computer/ship/viewscreen,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -22422,6 +22466,14 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/aisat/hallway)
+"sMI" = (
+/obj/structure/lattice,
+/obj/machinery/camera/motion{
+	c_tag = "Vault Exterior";
+	dir = 8
+	},
+/turf/open/space/basic,
+/area/ai_monitored/nuke_storage)
 "sNo" = (
 /obj/machinery/porta_turret/ai,
 /turf/open/floor/circuit,
@@ -22857,11 +22909,12 @@
 /turf/open/space/basic,
 /area/ai_monitored/security/armory)
 "tcz" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = 32
 	},
-/turf/open/floor/monofloor/airless,
-/area/nsv/hanger/mining)
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "tcE" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -23099,17 +23152,8 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "tkW" = (
-/obj/structure/sign/departments/cargo{
-	pixel_x = -31
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
+/turf/open/space/basic,
+/area/maintenance/starboard/fore)
 "tkZ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -23600,13 +23644,6 @@
 	name = "nanoweave carpet (bluer)"
 	},
 /area/crew_quarters/heads/captain/private)
-"tHR" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 8
-	},
-/obj/machinery/rnd/production/techfab/department/cargo,
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "tHY" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
 /obj/machinery/atmospherics/pipe/simple/green/visible/layer4,
@@ -23618,9 +23655,11 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/atmos/port_atmos)
 "tIN" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "tJq" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -23765,6 +23804,24 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons/fore)
+"tQD" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "tQH" = (
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/circuit,
@@ -24662,16 +24719,6 @@
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/vault,
 /area/ai_monitored/nuke_storage)
-"uIP" = (
-/obj/machinery/door/airlock/ship/maintenance{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"uJd" = (
-/obj/structure/ore_box,
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
 "uJM" = (
 /obj/machinery/atmospherics/pipe/simple/brown/hidden{
 	dir = 5
@@ -24833,22 +24880,6 @@
 /obj/structure/overmap/small_craft/transport/sabre/mining,
 /turf/open/floor/monofloor/airless,
 /area/nsv/hanger/mining)
-"uQz" = (
-/obj/machinery/door/airlock/ship/external/glass{
-	dir = 4;
-	req_one_access_txt = "31;48;79"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
 "uRq" = (
 /obj/effect/spawner/lootdrop/grille_or_trash,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -25147,10 +25178,6 @@
 /obj/effect/spawner/lootdrop/random_seeds,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"vho" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/ai_monitored/nuke_storage)
 "vhr" = (
 /obj/machinery/telecomms/broadcaster/preset_right,
 /turf/open/floor/circuit/telecomms/server,
@@ -25436,13 +25463,9 @@
 /turf/open/floor/carpet/ship,
 /area/hallway/upper/primary/port)
 "vsi" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/item/encryptionkey/pilot,
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/obj/structure/reagent_dispensers/foamtank/hull_repair_juice,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
 "vsB" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/machinery/telecomms/bus/preset_three,
@@ -25670,6 +25693,18 @@
 /obj/item/toy/plush/random,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
+"vCx" = (
+/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"
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
 "vCY" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
@@ -25712,14 +25747,16 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering/reactor_control)
 "vEn" = (
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 1
-	},
-/obj/structure/noticeboard/qm{
-	pixel_x = -32
+/obj/docking_port/stationary{
+	dir = 2;
+	id = "supply_home";
+	name = "Von Neumann Cargo Bay";
+	dwidth = 11;
+	height = 22;
+	width = 22
 	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
 "vEv" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -26123,21 +26160,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plating,
 /area/maintenance/central)
-"vRK" = (
-/obj/machinery/button/door{
-	id = "cargi";
-	name = "Cargo Doors";
-	pixel_y = -21
-	},
-/obj/effect/turf_decal/tile/brown/tile_side{
-	dir = 8
-	},
-/obj/item/banner/cargo,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/caution/red,
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "vSd" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -26271,17 +26293,11 @@
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
 "vYR" = (
-/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"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/turf/open/floor/monotile/steel/airless,
+/area/nsv/hanger/mining)
 "vZa" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -26686,20 +26702,6 @@
 	name = "nanoweave carpet (puce)"
 	},
 /area/nsv/weapons)
-"wpW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/advanced_airlock_controller/directional/north,
-/obj/machinery/light/small,
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
 "wpX" = (
 /obj/machinery/atmospherics/components/trinary/filter/atmos{
 	dir = 1;
@@ -26811,11 +26813,13 @@
 	},
 /area/nsv/weapons/fore)
 "wwl" = (
-/obj/effect/turf_decal/tile/brown/tile_side,
-/obj/machinery/camera/autoname{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/machinery/computer/ship/munitions_computer/west,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "wwu" = (
@@ -27046,21 +27050,6 @@
 	},
 /turf/open/floor/plating,
 /area/security/brig)
-"wJQ" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/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"
-	},
-/turf/open/floor/plasteel,
-/area/cargo/lobby)
 "wJX" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -27083,14 +27072,6 @@
 "wKR" = (
 /turf/closed/wall/r_wall/ship,
 /area/engine/shield_generator)
-"wLd" = (
-/obj/structure/lattice,
-/obj/machinery/camera/motion{
-	c_tag = "Vault Exterior";
-	dir = 8
-	},
-/turf/open/space/basic,
-/area/ai_monitored/nuke_storage)
 "wLw" = (
 /obj/structure/closet/secure_closet/RD,
 /obj/machinery/camera/autoname{
@@ -27292,28 +27273,24 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering)
 "wVH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/tile/brown/tile_side{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/machinery/computer/ship/viewscreen{
+	pixel_y = -5;
+	pixel_x = -32
 	},
-/obj/effect/landmark/patrol_node{
-	next_id = list("science","engineering","evac","munitions");
-	name = "Cargo patrol node";
-	id = "cargo"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "1-4"
 	},
-/turf/open/floor/carpet/ship,
-/area/hallway/nsv/deck1/frame2/starboard)
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "wXR" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible,
 /obj/machinery/meter,
@@ -27420,17 +27397,13 @@
 /turf/closed/wall/ship,
 /area/cargo/lobby)
 "xeO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tile/brown/tile_side,
+/obj/machinery/camera/autoname{
+	dir = 9
 	},
-/turf/open/floor/monotile/steel/airless,
-/area/nsv/hanger/mining)
+/obj/machinery/computer/ship/munitions_computer/west,
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "xeZ" = (
 /obj/structure/closet/firecloset/full,
 /turf/open/floor/carpet/ship,
@@ -27892,6 +27865,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/lobby)
+"xCI" = (
+/obj/machinery/door/airlock/ship/maintenance{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
 "xDW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable/yellow{
@@ -27925,12 +27904,11 @@
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/xenobiology)
 "xFF" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
+/obj/effect/landmark/start/cargo_technician,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
@@ -27940,17 +27918,14 @@
 /turf/open/floor/carpet/ship/purple_carpet,
 /area/science/lab)
 "xGS" = (
-/obj/machinery/camera/autoname{
-	dir = 5
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 1
 	},
-/obj/structure/closet/secure_closet/quartermaster,
-/obj/item/storage/box/fountainpens,
-/obj/item/storage/lockbox/medal/cargo,
-/obj/machinery/light_switch/west{
-	pixel_x = -19
+/obj/item/clothing/head/cone{
+	pixel_x = 2
 	},
 /turf/open/floor/plasteel,
-/area/quartermaster/qm)
+/area/cargo/lobby)
 "xGT" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -28195,6 +28170,18 @@
 	},
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/turret_protected/ai)
+"xQw" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/stamp/denied,
+/obj/item/stamp,
+/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs,
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "xQH" = (
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/light{
@@ -28303,11 +28290,15 @@
 /turf/open/floor/engine,
 /area/bridge/cic)
 "xVp" = (
-/obj/machinery/door/airlock/ship/maintenance{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/mineral/stacking_unit_console{
+	machinedir = 4;
+	pixel_y = -40
+	},
 /turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/area/maintenance/port/aft)
 "xVt" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -28328,6 +28319,15 @@
 /obj/structure/closet/firecloset/full,
 /turf/open/floor/circuit,
 /area/hallway/nsv/deck1/frame1/central)
+"xXZ" = (
+/obj/effect/turf_decal/tile/brown/tile_side{
+	dir = 1
+	},
+/obj/structure/noticeboard/qm{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "xYF" = (
 /obj/machinery/door/airlock/ship/maintenance{
 	name = "Server Maintenance";
@@ -39765,7 +39765,7 @@ dsp
 jfJ
 gvw
 ibj
-eIA
+xVp
 jfJ
 ifI
 kjo
@@ -40169,7 +40169,7 @@ lYg
 jfJ
 jfJ
 jfJ
-sjc
+sze
 jfJ
 pyq
 pyq
@@ -45421,7 +45421,7 @@ jfJ
 mHH
 nmj
 jfJ
-uIP
+xCI
 vNa
 ogQ
 kCx
@@ -47893,7 +47893,7 @@ qaT
 qaT
 dbF
 nEK
-hJH
+aWP
 qaT
 emO
 wEM
@@ -48095,7 +48095,7 @@ ssH
 uRq
 ssH
 kAy
-ipo
+vsi
 qaT
 emO
 wEM
@@ -48138,10 +48138,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -48297,7 +48297,7 @@ qaT
 qaT
 gzq
 bTy
-tIN
+afI
 qaT
 emO
 wEM
@@ -48340,10 +48340,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -48499,7 +48499,7 @@ vpF
 vpF
 jom
 qFL
-hmz
+hJH
 qaT
 emO
 wEM
@@ -48542,10 +48542,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -48701,7 +48701,7 @@ vpF
 vpF
 nbO
 qFL
-hmz
+hJH
 qaT
 emO
 wEM
@@ -48744,10 +48744,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -48946,10 +48946,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -49104,7 +49104,7 @@ qaT
 qaT
 qaT
 qaT
-xVp
+kAp
 qaT
 qaT
 emO
@@ -49148,10 +49148,10 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
+tkW
 lfF
 lfF
 jRk
@@ -49300,8 +49300,8 @@ oKx
 cry
 sTk
 xSS
-xGS
-eqe
+hmz
+fAX
 qaT
 jJJ
 vhg
@@ -49350,9 +49350,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -49501,9 +49501,9 @@ hFA
 jgX
 tdU
 fNl
-hQo
-kwt
-kql
+ira
+qcB
+sjc
 qaT
 ctG
 qFL
@@ -49552,9 +49552,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -49701,13 +49701,13 @@ nbR
 xeL
 fob
 jgX
-tHR
+keT
 fNl
-jkE
-qqv
-hzm
+bfq
+rSG
+sKP
 qaT
-fAX
+tcz
 qFL
 rkn
 jJJ
@@ -49754,9 +49754,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -49901,18 +49901,18 @@ blq
 ljs
 wTE
 kDF
-ixa
+pIY
 jgX
-lxx
+pmI
 sTk
 fNl
 sTk
-gMY
+ixa
 qaT
 qFL
-sKP
+ouj
 qaT
-kAp
+jYi
 qaT
 qaT
 emO
@@ -49956,9 +49956,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -50105,12 +50105,12 @@ wTE
 msO
 kIj
 rHg
-dEh
-cUB
-pmI
-vEn
-lvi
-keT
+mvz
+kFi
+xGS
+xXZ
+eSt
+iWz
 qFL
 oqm
 qaT
@@ -50158,9 +50158,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -50305,13 +50305,13 @@ blq
 ivV
 wTE
 jzJ
-ixa
-nov
+pIY
+oXu
 fVq
 fVq
 fVq
 xql
-gya
+nQq
 qaT
 qaT
 qaT
@@ -50360,9 +50360,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -50509,17 +50509,17 @@ wTE
 xeL
 vOq
 bFz
+xFF
+xFF
+xFF
 kiz
-kiz
-kiz
-gFg
-qOl
-sjb
+tQD
+wVH
 vvU
-iDc
+anB
 gxQ
 fDy
-pIY
+bJp
 wEM
 wEM
 wEM
@@ -50562,9 +50562,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -50707,7 +50707,7 @@ oZV
 pcn
 blq
 dIl
-wVH
+gQP
 mBV
 snO
 qcO
@@ -50716,12 +50716,12 @@ rsS
 wmQ
 euH
 eOm
-wJQ
+flS
 uyw
 ltK
-vRK
+rDH
 fDy
-pIY
+bJp
 wEM
 wEM
 wEM
@@ -50764,9 +50764,9 @@ lfF
 lfF
 lfF
 lfF
-sqP
-sqP
-sqP
+tkW
+tkW
+tkW
 lfF
 lfF
 lfF
@@ -50922,8 +50922,8 @@ mku
 eZW
 eZW
 hDS
-sze
-est
+ipo
+vEn
 wEM
 wEM
 wEM
@@ -51114,8 +51114,8 @@ uPk
 hXa
 ngY
 aRo
-vsi
-vsi
+sqP
+sqP
 rUx
 qGb
 dGF
@@ -51124,8 +51124,8 @@ uPy
 aPc
 uBy
 hDS
-sze
-pIY
+ipo
+bJp
 wEM
 wEM
 wEM
@@ -51320,14 +51320,14 @@ gPs
 gPs
 gPs
 mtH
-ccN
+jXO
 bwC
-xFF
+wwl
 ltK
 ltK
-ojx
+aCp
 fDy
-pIY
+bJp
 wEM
 wEM
 wEM
@@ -51521,15 +51521,15 @@ vau
 uVi
 uVi
 hVU
-aCp
-vYR
+gFg
+vCx
 ngY
-bCa
+dSt
 ltK
 ltK
 gnJ
 fDy
-pIY
+bJp
 wEM
 wEM
 wEM
@@ -51726,10 +51726,10 @@ bNx
 bNx
 hKz
 bNx
-jDP
+xQw
 aOm
-wwl
-cbI
+xeO
+tIN
 fDy
 lYg
 emO
@@ -51921,12 +51921,12 @@ kIv
 mTY
 kvK
 iQn
-vho
-wLd
-vho
-vho
+nov
+sMI
+nov
+nov
 jPC
-xeO
+fHv
 jPC
 fDy
 fDy
@@ -52128,7 +52128,7 @@ iQn
 iQn
 iQn
 jPC
-wpW
+qOl
 jPC
 cgx
 ums
@@ -52330,9 +52330,9 @@ jaN
 upN
 iQn
 jPC
-uQz
+pWy
 jPC
-uJd
+dnl
 wJw
 wJw
 wJw
@@ -52533,9 +52533,9 @@ cVR
 iQn
 jPC
 sFq
-tkW
-psP
-tcz
+auO
+vYR
+aUr
 wJw
 wJw
 rzh